Changeset 897 for cpp/common

Timestamp:

11/30/19 01:46:51 (5 years ago)

Author:

Maciej Komosinski

Message:

A workaround for Android bug in vsnprintf() and vsprintf() needed in more classes (introduced earlier in r892), ​​https://github.com/android-ndk/ndk/issues/879

File:

• cpp/common/util-string.cpp (modified) (1 diff)

cpp/common/util-string.cpp

@@ -53 +53 @@
                         if (n < 0) //vsprintf was also buggy. If we were strict, we should abort the app now.
                         {
-                                strcpy(buf, "[STR_ERR] "); //just to indicate the returned string is invalid
-                                strcat(buf, format); //return just the original formatting string
-                                __android_log_print(ANDROID_LOG_ERROR, LOG_APP_NAME, "vsprintf() also failed, returning incorrect string '%s'", buf);
+                                strcpy(buf, "[STR_ERR] "); //a special prefix just to indicate the returned string is incorrect
+                                strcat(buf, format); //append and return the original formatting string
+                                __android_log_print(ANDROID_LOG_ERROR, LOG_APP_NAME, "vsprintf() also failed, using the incorrect resulting string: '%s'", buf);
                         }
-                        n = 0; //pretend vsnprintf() or vsprintf() was OK to exit the endless loop
+                        n = strlen(buf); //pretend vsnprintf() or vsprintf() was OK to exit the endless loop
                 }
 #endif