Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20df25aa authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server... 

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

* commit '7928ca6f87af4b70086ecf75383ba43da37da891':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
parents 3cb13098 3e9eeb3b

media/libstagefright/rtsp/ASessionDescription.cpp

+7 −5
Original line number Diff line number Diff line
@@ -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);