Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/udhcp/domain_codec.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/udhcp/domain_codec.c (modified) (6 diffs)

branches/3.3/mindi-busybox/networking/udhcp/domain_codec.c

@@ -8 +8 @@
  */
 #ifdef DNS_COMPR_TESTING
+# define _GNU_SOURCE
 # define FAST_FUNC /* nothing */
 # define xmalloc malloc
@@ -43 +44 @@
     while (1) {
         /* note: "return NULL" below are leak-safe since
-         * dst isn't yet allocated */
+         * dst isn't allocated yet */
         const uint8_t *c;
         unsigned crtpos, retpos, depth, len;
@@ -64 +65 @@
                     return NULL;
                 if (dst)
-                    memcpy(dst + len, c + 1, *c);
+                    /* \3com ---> "com." */
+                    ((char*)mempcpy(dst + len, c + 1, *c))[0] = '.';
                 len += *c + 1;
                 crtpos += *c + 1;
-                if (dst)
-                    dst[len - 1] = '.';
             } else {
                 /* NUL: end of current domain name */
@@ -79 +79 @@
                     retpos = depth = 0;
                 }
-                if (dst)
+                if (dst && len != 0)
+                    /* \4host\3com\0\4host and we are at \0:
+                     * \3com was converted to "com.", change dot to space.
+                     */
                     dst[len - 1] = ' ';
             }
@@ -96 +99 @@
             /* allocate dst buffer and copy pre */
             unsigned plen = strlen(pre);
-            ret = dst = xmalloc(plen + len);
-            memcpy(dst, pre, plen);
-            dst += plen;
+            ret = xmalloc(plen + len);
+            dst = stpcpy(ret, pre);
         } else {
             dst[len - 1] = '\0';
@@ -229 +231 @@
     uint8_t *encoded;
 
+        uint8_t str[6] = { 0x00, 0x00, 0x02, 0x65, 0x65, 0x00 };
+        printf("NUL:'%s'\n",   dname_dec(str, 6, ""));
+
 #define DNAME_DEC(encoded,pre) dname_dec((uint8_t*)(encoded), sizeof(encoded), (pre))
     printf("'%s'\n",       DNAME_DEC("\4host\3com\0", "test1:"));