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

Commit 412dc7de authored by Kenny Root's avatar Kenny Root
Browse files

Fix off-by-one in parse3339 timezone check 

parse3339 could read past the end of a string if the timezone was
truncated by one character causing intermittent failures in unit
tests.

Change-Id: I7e1724c6a7b464fdcb5e2b37469eb128303a51f1
parent 3619b9ab

core/jni/android_text_format_Time.cpp

+2 −2
Original line number Diff line number Diff line
@@ -584,9 +584,9 @@ static jboolean android_text_format_Time_parse3339(JNIEnv* env, 
            inUtc = true;



	    if (offset != 0) {

	        if (len < tz_index + 5) {

	        if (len < tz_index + 6) {

	            char msg[100];

	            sprintf(msg, "Unexpected length; should be %d characters", tz_index + 5);

	            sprintf(msg, "Unexpected length; should be %d characters", tz_index + 6);

	            jniThrowException(env, "android/util/TimeFormatException", msg);

	            return false;

	        }