Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb

Browse Source
This commit is contained in:
Andreas Huber
2011-01-12 14:33:51 -08:00
committed by Android (Google) Code Review
parent 068b41d5d4 4bca5e19d5
commit 7928ca6f87
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/libstagefright/rtsp/ASessionDescription.cpp
View File

@@ -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);