Changeset 96 in libcf

Timestamp:

05/27/13 09:37:51 (11 years ago)

Author:

cheese

Message:

#1 fix hex decoder exception and rollback function interface of decoders

Location:

trunk

Files:

• include/cf_codec.h (modified) (2 diffs)
• src/cf_codec.c (modified) (9 diffs)
• test/codec.c (modified) (3 diffs)
• test/test.c (modified) (3 diffs)

trunk/include/cf_codec.h

@@ -25 +25 @@
 CF_EXPORT int
 CF_Codec_Hex_Decode         (const char     * hex,
-                             unsigned char  * bin);
+                             unsigned char  * bin,
+                             size_t         * len);
 
 CF_EXPORT int
@@ -34 +35 @@
 CF_EXPORT int
 CF_Codec_Base64_Decode      (const char     * base64,
-                             unsigned char  * bin);
+                             unsigned char  * bin,
+                             size_t         * len);
 
 #ifdef __cplusplus

trunk/src/cf_codec.c

@@ -73 +73 @@
  *
  * @param bin   바이너리 데이터
- * @param len   바이너리 데이터 길이
+ * @param len   바이너리 데이터의 길이
  * @param hex   16진수 문자열을 저장할 주소
  *
@@ -114 +114 @@
  * @param hex   16진수 문자열
  * @param bin   바이너리 데이터를 저장할 주소
+ * @param len   바이너리 데이터의 길이를 저장할 주소
  *
  * @remark
@@ -120 +121 @@
 int
 CF_Codec_Hex_Decode (const char     * hex,
-                     unsigned char  * bin)
-{
-    size_t  length = strlen (hex);  /* absolutely even-number */
+                     unsigned char  * bin,
+                     size_t         * len)
+{
+    size_t  length = 0; /* absolutely even-number */
     size_t  iter = 0;
-    int     binlen = (int)length / 2;
+    size_t  binlen = 0;
 
     const char      * ptr = hex;
@@ -133 +135 @@
     ASSERT_ARGS (hex == NULL);
     ASSERT_ARGS (bin == NULL);
-
-    for (iter = 0 ; iter < binlen ; iter++)
+    ASSERT_ARGS (len == NULL);
+
+    *len = 0;
+
+    for ( ; g_ascii_HexDecode[(int)*ptr] && *ptr ; ptr++, length++);
+
+    if (*ptr)
+        return CF_ERROR_CODEC_NOT_HEXSTRING;
+
+    binlen = length / 2;
+
+    for (iter = 0, ptr = hex ; *ptr ; iter++)
     {
         val = 0;    /* init/re-init docoding-buffer */
@@ -145 +157 @@
         asciiHex = g_ascii_HexDecode[(int)buf];     \
                                                     \
-        if (buf)                                    \
-            val |=  (unsigned char)                 \
-                    (buf - asciiHex + (asciiHex == '0' ? 0 : 10));  \
-        else                                        \
-            return CF_ERROR_CODEC_NOT_HEXSTRING;    \
+        val |=  (unsigned char)                     \
+                (buf - asciiHex + (asciiHex == '0' ? 0 : 10));  \
         } while (0)
 
@@ -159 +168 @@
     }
 
-    return binlen;
+    * len = binlen;
+
+    return CF_OK;
 }
 
@@ -232 +243 @@
  * @param base64    base64 문자열
  * @param bin       바이너리 데이터를 저장할 주소
+ * @param len       바이너리 데이터의 길이를 저장할 주소
  *
  * @remark
@@ -238 +250 @@
 int
 CF_Codec_Base64_Decode (const char      * base64,
-                        unsigned char   * bin)
+                        unsigned char   * bin,
+                        size_t          * len)
 {
     const char      * src = base64;
@@ -247 +260 @@
     ASSERT_ARGS (src == NULL);
     ASSERT_ARGS (dst == NULL);
+    ASSERT_ARGS (len == NULL);
+
+    *len = 0;
 
     while (g_ascii_Base64Decode[(int)*src] < BASE64_PADDING_CHAR_INDEX) src++;

trunk/test/codec.c

@@ -14 +14 @@
     char encode[512] = {0x00,};
     unsigned char bin[512] = {0x00,};
-    int length = 0;
+    size_t length = 0;
 
     /* hex */
@@ -25 +25 @@
 
     CF_DEBUG_PRINT (stderr, "= Convert hex to binary =\n");
-    length = CF_Codec_Hex_Decode (encode, bin);
-    if (length < 0) {
+    if (CF_Codec_Hex_Decode (encode, bin, &length) < 0) {
         // error
     }
-    CF_DEBUG_PRINT_BIN (stderr, bin, (size_t)length, "bin    : %s\n", bin);
+    else
+        CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin    : %s\n", bin);
 
     memset (bin   , 0x00, sizeof (bin));
@@ -43 +43 @@
 
     CF_DEBUG_PRINT (stderr, "= Convert base64 to binary =\n");
-    length = CF_Codec_Base64_Decode (encode, bin);
-    if (length < 0) {
+    if (CF_Codec_Base64_Decode (encode, bin, &length) < 0) {
         // error
     }
-    CF_DEBUG_PRINT_BIN (stderr, bin, (size_t)length, "bin    : %s\n", bin);
+    else
+        CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin    : %s\n", bin);
 
     return 0;

trunk/test/test.c

@@ -389 +389 @@
     char encode[512] = {0x00,};
     unsigned char bin[512] = {0x00,};
-    int length = 0;
+    size_t length = 0;
 
     /* hex */
@@ -400 +400 @@
 
     CF_DEBUG_PRINT (stderr, "= Convert hex to binary =\n");
-    length = CF_Codec_Hex_Decode (encode, bin);
-    if (length < 0) {
-        // error
-    }
-    CF_DEBUG_PRINT_BIN (stderr, bin, (size_t)length, "bin    : %s\n", bin);
+    if (CF_Codec_Hex_Decode (encode, bin, &length) < 0) {
+        // error
+    }
+    else
+        CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin    : %s\n", bin);
 
     memset (bin   , 0x00, sizeof (bin));
@@ -418 +418 @@
 
     CF_DEBUG_PRINT (stderr, "= Convert base64 to binary =\n");
-    length = CF_Codec_Base64_Decode (encode, bin);
-    if (length < 0) {
-        // error
-    }
-    CF_DEBUG_PRINT_BIN (stderr, bin, (size_t)length, "bin    : %s\n", bin);
-}
+    if (CF_Codec_Base64_Decode (encode, bin, &length) < 0) {
+        // error
+    }
+    else
+        CF_DEBUG_PRINT_BIN (stderr, bin, length, "bin    : %s\n", bin);
+}