summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp/ASessionDescription.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-12 09:57:23 -0800
committerAndreas Huber <andih@google.com>2011-01-12 10:31:04 -0800
commit934ca8cb1bcffcf1781a576ca625d2f901e5f0a9 (patch)
tree946f9b81777549201bfff4446fcfcdb005cf3d44 /media/libstagefright/rtsp/ASessionDescription.cpp
parentc4c3a2d4123f7dfe8c6ed0c26fb14aeb7b8d8f61 (diff)
downloadframeworks_av-934ca8cb1bcffcf1781a576ca625d2f901e5f0a9.zip
frameworks_av-934ca8cb1bcffcf1781a576ca625d2f901e5f0a9.tar.gz
frameworks_av-934ca8cb1bcffcf1781a576ca625d2f901e5f0a9.tar.bz2
Fail to parse duration instead of asserting, if the server response cannot be parsed.
Change-Id: I42324468edca5ccce29486059091da8e64f36326 related-to-bug: 3338518
Diffstat (limited to 'media/libstagefright/rtsp/ASessionDescription.cpp')
-rw-r--r--media/libstagefright/rtsp/ASessionDescription.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp
index 547fbab..77917b3 100644
--- a/media/libstagefright/rtsp/ASessionDescription.cpp
+++ b/media/libstagefright/rtsp/ASessionDescription.cpp
@@ -265,15 +265,17 @@ bool ASessionDescription::getDurationUs(int64_t *durationUs) const {
const char *s = value.c_str() + 4;
char *end;
double from = strtod(s, &end);
- CHECK_GT(end, s);
- CHECK_EQ(*end, '-');
+
+ if (end == s || *end != '-') {
+ return false;
+ }
s = end + 1;
double to = strtod(s, &end);
- CHECK_GT(end, s);
- CHECK_EQ(*end, '\0');
- CHECK_GE(to, from);
+ if (end == s || *end != '\0' || to < from) {
+ return false;
+ }
*durationUs = (int64_t)((to - from) * 1E6);