summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-04-24 10:45:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-24 10:45:13 -0700
commit89407b01795ebc56033b09e3a48defaa290bb3c5 (patch)
treee6a06879ffb267632ce6ad91421e4e0622d9a1c4 /media/libstagefright/rtsp
parent8dca22b0d016cf81681341d76bc44bb3b76d58a8 (diff)
parent0fb06b85e9f40cc695542a101113255693c91321 (diff)
downloadframeworks_av-89407b01795ebc56033b09e3a48defaa290bb3c5.zip
frameworks_av-89407b01795ebc56033b09e3a48defaa290bb3c5.tar.gz
frameworks_av-89407b01795ebc56033b09e3a48defaa290bb3c5.tar.bz2
am 0fb06b85: am 0dbff625: Merge "Fix overflow of rand in ARTPConnection"
* commit '0fb06b85e9f40cc695542a101113255693c91321': Fix overflow of rand in ARTPConnection
Diffstat (limited to 'media/libstagefright/rtsp')
-rw-r--r--media/libstagefright/rtsp/ARTPConnection.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp
index 501a970..af369b5 100644
--- 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) {