From 98de8381dbe5c50477e03d7571d53a836b4500fa Mon Sep 17 00:00:00 2001 From: Riza Sulistyo Date: Fri, 1 Apr 2016 02:34:48 +0000 Subject: 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 git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5272 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/src/pj/guid_android.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pjlib/src/pj/guid_android.c b/pjlib/src/pj/guid_android.c index 02d473c9..b2e5fec0 100644 --- a/pjlib/src/pj/guid_android.c +++ b/pjlib/src/pj/guid_android.c @@ -47,7 +47,7 @@ static pj_bool_t attach_jvm(JNIEnv **jni_env) (*pj_jni_jvm)->DetachCurrentThread(pj_jni_jvm); -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() { @@ -103,7 +103,7 @@ PJ_DEF(pj_str_t*) pj_generate_unique_string(pj_str_t *str) 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); detach_jvm(attached); -- cgit v1.2.3