Merge "Fix overflow of rand in ARTPConnection"

0dbff625 · Andreas Huber · Gerrit Code Review · 628a8c0e · be21e039 · 0dbff625
Commit 0dbff625 authored 12 years ago by Andreas Huber Committed by Gerrit Code Review 12 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

media/libstagefright/rtsp/ARTPConnection.cpp media/libstagefright/rtsp/ARTPConnection.cpp +2 -1

No files found.
--- a/media/libstagefright/rtsp/ARTPConnection.cpp
+++ b/media/libstagefright/rtsp/ARTPConnection.cpp
@@ -117,7 +117,8 @@ void ARTPConnection::MakePortPair(

    bumpSocketBufferSize(*rtcpSocket);

-    unsigned start = (rand() * 1000)/ RAND_MAX + 15550;
+    /* rand() * 1000 may overflow int type, use long long */
+    unsigned start = (unsigned)((rand()* 1000ll)/RAND_MAX) + 15550;
    start &= ~1;

    for (unsigned port = start; port < 65536; port += 2) {