fix rejection of dns responses with pointers past 512 byte offset

[musl] / src / string / strverscmp.c

diff --git a/src/string/strverscmp.c b/src/string/strverscmp.c
index 33a42ee..16c1da2 100644 (file)
--- a/src/string/strverscmp.c
+++ b/src/string/strverscmp.c
@@ -1,40 +1,34 @@
 #define _GNU_SOURCE
 #include <ctype.h>
 #include <string.h>
-#include <sys/types.h>
 
-int strverscmp(const char *l, const char *r)
+int strverscmp(const char *l0, const char *r0)
 {
-       int haszero=1;
-       while (*l==*r) {
-               if (!*l) return 0;
+       const unsigned char *l = (const void *)l0;
+       const unsigned char *r = (const void *)r0;
+       size_t i, dp, j;
+       int z = 1;
 
-               if (*l=='0') {
-                       if (haszero==1) {
-                               haszero=0;
-                       }
-               } else if (isdigit(*l)) {
-                       if (haszero==1) {
-                               haszero=2;
-                       }
-               } else {
-                       haszero=1;
-               }
-               l++; r++;
+       /* Find maximal matching prefix and track its maximal digit
+        * suffix and whether those digits are all zeros. */
+       for (dp=i=0; l[i]==r[i]; i++) {
+               int c = l[i];
+               if (!c) return 0;
+               if (!isdigit(c)) dp=i+1, z=1;
+               else if (c!='0') z=0;
        }
-       if (haszero==1 && (*l=='0' || *r=='0')) {
-               haszero=0;
-       }
-       if ((isdigit(*l) && isdigit(*r) ) && haszero) {
-               size_t lenl=0, lenr=0;
-               while (isdigit(l[lenl]) ) lenl++;
-               while (isdigit(r[lenr]) ) lenr++;
-               if (lenl==lenr) {
-                       return (*l -  *r);
-               } else {
-                       return (lenl - lenr);
-               }
-       } else {
-               return (*l -  *r);
+
+       if (l[dp]-'1'<9U && r[dp]-'1'<9U) {
+               /* If we're looking at non-degenerate digit sequences starting
+                * with nonzero digits, longest digit string is greater. */
+               for (j=i; isdigit(l[j]); j++)
+                       if (!isdigit(r[j])) return 1;
+               if (isdigit(r[j])) return -1;
+       } else if (z && dp<i && (isdigit(l[i]) || isdigit(r[i]))) {
+               /* Otherwise, if common prefix of digit sequence is
+                * all zeros, digits order less than non-digits. */
+               return (unsigned char)(l[i]-'0') - (unsigned char)(r[i]-'0');
        }
+
+       return l[i] - r[i];
 }