Changeset 5224 for pjproject

Timestamp:

Dec 30, 2015 11:52:54 PM (9 years ago)

Author:

ming

Message:

Re #1882 (misc): Add checking before calling pj_strncpy(), to make it more robust and consistent with the other two checks below.
Note that without the check, it should be safe, but the buffer could point to one byte after the buffer, even though the string length is zero.

Thanks to Dusan Klinec for the proposed patch.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

@@ -250 +250 @@
 
     /* contact */
-    info->contact.ptr = info->buf_ + total;
-    pj_strncpy(&info->contact, &buddy->contact, sizeof(info->buf_)-total);
-    total += info->contact.slen;
+    if (total < sizeof(info->buf_)) {
+        info->contact.ptr = info->buf_ + total;
+        pj_strncpy(&info->contact, &buddy->contact, sizeof(info->buf_) - total);
+        total += info->contact.slen;
+    } else {
+        info->contact = pj_str("");
+    }
 
     /* Presence status */