diff options
author | Andreas Huber <andih@google.com> | 2011-01-12 14:33:51 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-12 14:33:51 -0800 |
commit | 7928ca6f87af4b70086ecf75383ba43da37da891 (patch) | |
tree | ccda630662da7e522c4969dc94fea701b7554a62 /media | |
parent | 068b41d5d41a4a78c96586b85ea89d464d302548 (diff) | |
parent | 4bca5e19d5863bc0cd94cf99871743d26c7f3a87 (diff) | |
download | frameworks_base-7928ca6f87af4b70086ecf75383ba43da37da891.zip frameworks_base-7928ca6f87af4b70086ecf75383ba43da37da891.tar.gz frameworks_base-7928ca6f87af4b70086ecf75383ba43da37da891.tar.bz2 |
Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/rtsp/ASessionDescription.cpp | 12 |
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); |