Changeset 4613 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Oct 8, 2013 9:08:13 AM (11 years ago)

Author:

bennylp

Message:

Re #1703: fixing general bugs. First installment: correct handling of snprintf return value

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -1044 +1044 @@
     char b64_key[PJ_BASE256_TO_BASE64_LEN(MAX_KEY_LEN)+1];
     int b64_key_len = sizeof(b64_key);
+    int print_len;
 
     if (cs_idx == -1)
@@ -1102 +1103 @@
 
     /* Print the crypto attribute value. */
-    *buffer_len = pj_ansi_snprintf(buffer, *buffer_len, "%d %s inline:%s",
+    print_len = pj_ansi_snprintf(buffer, *buffer_len, "%d %s inline:%s",
                                    tag, 
                                    crypto_suites[cs_idx].name,
                                    b64_key);
+    if (print_len < 1 || print_len >= *buffer_len)
+        return PJ_ETOOSMALL;
+
+    *buffer_len = print_len;
 
     return PJ_SUCCESS;