Changeset 5589

Timestamp:

May 4, 2017 5:22:44 AM (8 years ago)

Author:

ming

Message:

Re #1994 (misc): Fixes bugs in base64

• move access to input parameter variable after the assertion to check the variable.
• prevent invalid memory access for empty input string
• allow using an output buffer of just the right size

Thanks to Adrien Béraud for the patch

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/base64.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/base64.c

@@ -125 +125 @@
                                      pj_uint8_t *out, int *out_len)
 {
-    const char *buf = input->ptr;
-    int len = (int)input->slen;
+    const char *buf;
+    int len;
     int i, j, k;
     int c[4];
@@ -132 +132 @@
     PJ_ASSERT_RETURN(input && out && out_len, PJ_EINVAL);
 
-    while (buf[len-1] == '=' && len)
+    buf = input->ptr;
+    len = (int)input->slen;
+    while (len && buf[len-1] == '=')
         --len;
 
@@ -162 +164 @@
     }
 
-    pj_assert(j < *out_len);
+    pj_assert(j <= *out_len);
     *out_len = j;