Changeset 5272

Timestamp:

Apr 1, 2016 2:34:48 AM (7 years ago)

Author:

riza

Message:

Re #1909: Fixed crash related to r5264.

• pj_generate_unique_string() expecting the user to specify the slen of the output string, this will lead to assert on pj_strncpy() if not set
• modify PJ_GUID_STRING_LENGTH to 36

File:

• pjproject/trunk/pjlib/src/pj/guid_android.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/guid_android.c

@@ -48 +48 @@
 
 
-PJ_DEF_DATA(const unsigned) PJ_GUID_STRING_LENGTH=37;
+PJ_DEF_DATA(const unsigned) PJ_GUID_STRING_LENGTH=36;
 
 PJ_DEF(unsigned) pj_GUID_STRING_LENGTH()
@@ -104 +104 @@
     native_str.ptr = (char *)native_string;
     native_str.slen = pj_ansi_strlen(native_string);
-    pj_strncpy(str, &native_str, str->slen);
+    pj_strncpy(str, &native_str, PJ_GUID_STRING_LENGTH);
 
     (*jni_env)->ReleaseStringUTFChars(jni_env, uuid_string, native_string);