Changeset 91 in libcf

Timestamp:

05/19/13 13:24:43 (11 years ago)

Author:

cheese

Message:

#1 fix base64 bug

File:

• trunk/src/cf_codec.c (modified) (8 diffs)

trunk/src/cf_codec.c

@@ -77 +77 @@
  *
  * @remark
- * hex는 할당된 메모리이며, 크기는 '\0'를 포함하여 len * 2 + 1
+ * hex는 할당된 메모리이며, 크기는 '\0'를 제외하고 len * 2
  */
 int
@@ -172 +172 @@
  *
  * @remark
- * base64는 할당된 메모리이며, 크기는 ((len + 2) / 3) * 4
- * (null-character 제외)
+ * base64는 할당된 메모리이며, 크기는 '\0'를 제외하고 ((len + 2) / 3) * 4
  */
 int
@@ -209 +208 @@
         if (src - bin == len - 1)
         {
-            *dst++ = g_table_Base64Encode[SEXTUPLE_E_2 (bin)];
+            *dst++ = g_table_Base64Encode[SEXTUPLE_E_2 (src)];
             *dst++ = g_table_Base64Encode[BASE64_PADDING_CHAR_INDEX];
         }
         else
         {
-            *dst++ = g_table_Base64Encode[SEXTUPLE_E_2 (bin)|
-                                          SEXTUPLE_E_3 (bin)];
-            *dst++ = g_table_Base64Encode[SEXTUPLE_E_4 (bin)];
+            *dst++ = g_table_Base64Encode[SEXTUPLE_E_2 (src)|
+                                          SEXTUPLE_E_3 (src)];
+            *dst++ = g_table_Base64Encode[SEXTUPLE_E_4 (src)];
         }
 
@@ -235 +234 @@
  *
  * @remark
- * base64는 할당된 메모리이며, 크기는 (strlen (base64) - <패딩 길이>) / 4 * 3
+ * base64는 할당된 메모리이며, 크기는 (strlen (base64)) / 4 * 3
  */
 int
@@ -241 +240 @@
                         unsigned char   * bin)
 {
-    int             remain = 0;
     const char      * src = base64;
     unsigned char   * dst = bin;
+    int             remain = 0;
     int             binlen = 0;
 
@@ -251 +250 @@
     while (g_ascii_Base64Decode[(int)*src] < BASE64_PADDING_CHAR_INDEX) src++;
 
-    if (*src)
+    if (*src == 0xff)
         return CF_ERROR_CODEC_NOT_BASE64;
 
     remain = (int)(src - base64);
-    binlen = ((remain + 3) / 4) * 3;
+    binlen = ((remain + 2/* max padding length */) / 4) * 3;
 
 #define SEXTUPLE_D_1(src)   (g_ascii_Base64Decode[(int)src[0]] << 2)
@@ -264 +263 @@
 #define SEXTUPLE_D_6(src)   (g_ascii_Base64Decode[(int)src[3]]     )
 
-    for (src = base64, dst = bin ; remain > 4 ; remain -= 4, src += 4)
+    for (src = base64 ; remain > 4 ; remain -= 4, src += 4)
     {
         *dst++ = (unsigned char)(SEXTUPLE_D_1 (src) | SEXTUPLE_D_2 (src));
@@ -278 +277 @@
         *dst++ = (unsigned char)(SEXTUPLE_D_5 (src) | SEXTUPLE_D_6 (src));
 
-    return binlen;
-}
+    return binlen - (4 % remain);
+}