commit f0a546b65c79638ea56248403782a3743a7f9165
author Haibo Huang <hhb@google.com> Tue Sep 01 20:28:19 2020 -0700
committer Haibo Huang <hhb@google.com> Tue Sep 01 20:28:19 2020 -0700
tree 75726f666da36d3e04c2e9bfb3cff40547944ed8
parent 6d651902babae6219f1b5ea2d7e908c8caefe15c

Upgrade libxml2 to f0fd1b67fc883a24cdd039abb3d4fe4696104d72

Test: make
Change-Id: Id00e9ce2bd9edc06e79985b707d2300572d2af62

xmlstring.c

diff --git a/xmlstring.c b/xmlstring.c
index 8d2e06f..e8a1e45 100644
--- a/xmlstring.c
+++ b/xmlstring.c
@@ -130,16 +130,18 @@
 
 int
 xmlStrcmp(const xmlChar *str1, const xmlChar *str2) {
-    register int tmp;
-
     if (str1 == str2) return(0);
     if (str1 == NULL) return(-1);
     if (str2 == NULL) return(1);
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    return(strcmp((const char *)str1, (const char *)str2));
+#else
     do {
-        tmp = *str1++ - *str2;
+        int tmp = *str1++ - *str2;
         if (tmp != 0) return(tmp);
     } while (*str2++ != 0);
     return 0;
+#endif
 }
 
 /**
@@ -158,10 +160,14 @@
     if (str1 == str2) return(1);
     if (str1 == NULL) return(0);
     if (str2 == NULL) return(0);
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    return(strcmp((const char *)str1, (const char *)str2) == 0);
+#else
     do {
         if (*str1++ != *str2) return(0);
     } while (*str2++);
     return(1);
+#endif
 }
 
 /**
@@ -204,18 +210,15 @@
 
 int
 xmlStrncmp(const xmlChar *str1, const xmlChar *str2, int len) {
-    register int tmp;
-
     if (len <= 0) return(0);
     if (str1 == str2) return(0);
     if (str1 == NULL) return(-1);
     if (str2 == NULL) return(1);
-#ifdef __GNUC__
-    tmp = strncmp((const char *)str1, (const char *)str2, len);
-    return tmp;
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    return(strncmp((const char *)str1, (const char *)str2, len));
 #else
     do {
-        tmp = *str1++ - *str2;
+        int tmp = *str1++ - *str2;
         if (tmp != 0 || --len == 0) return(tmp);
     } while (*str2++ != 0);
     return 0;