diff options
author | Andreas Huber <andih@google.com> | 2013-04-24 09:52:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-24 09:52:49 -0700 |
commit | a3840fdfe6fdb8dd07d78d3f3202003649e952e9 (patch) | |
tree | 40f9c75d6beb4516a902afa5a519ba18574bc61f /media/libstagefright/rtsp | |
parent | 6bc71cac3619b0a5bb70d87abded691f3f929e3b (diff) | |
parent | 189660fdc736b495fee20d4a83a7d8a3573e4309 (diff) | |
download | frameworks_av-a3840fdfe6fdb8dd07d78d3f3202003649e952e9.zip frameworks_av-a3840fdfe6fdb8dd07d78d3f3202003649e952e9.tar.gz frameworks_av-a3840fdfe6fdb8dd07d78d3f3202003649e952e9.tar.bz2 |
am 0dbff625: Merge "Fix overflow of rand in ARTPConnection"
* commit '0dbff625c3128962b48f3476ceacb3ac80a3f421':
Fix overflow of rand in ARTPConnection
Diffstat (limited to 'media/libstagefright/rtsp')
-rw-r--r-- | media/libstagefright/rtsp/ARTPConnection.cpp | 3 |
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) { |