Upgrade to libxml 2.9.2 and libxslt 1.1.28

third_party/libxml/src/xmlmemory.c

 /*
  * xmlmemory.c:  libxml memory allocator wrapper.
  *
  * daniel@veillard.com
  */
 
 #define IN_LIBXML
 #include "libxml.h"
 
 #include <string.h>
@@ skipping 40 matching lines @@
 static int xmlMemInitialized = 0;
 static unsigned long  debugMemSize = 0;
 static unsigned long  debugMemBlocks = 0;
 static unsigned long  debugMaxMemSize = 0;
 static xmlMutexPtr xmlMemMutex = NULL;
 
 void xmlMallocBreakpoint(void);
 
 /************************************************************************
  *                                                                      *
- *              Macros, variables and associated types                  *
+ *              Macros, variables and associated types                  *
  *                                                                      *
  ************************************************************************/
 
 #if !defined(LIBXML_THREAD_ENABLED) && !defined(LIBXML_THREAD_ALLOC_ENABLED)
 #ifdef xmlMalloc
 #undef xmlMalloc
 #endif
 #ifdef xmlRealloc
 #undef xmlRealloc
 #endif
@@ skipping 126 matching lines @@
     xmlGenericError(xmlGenericErrorContext,
             "Malloc(%d) Ok\n",size);
 #endif
 
     if (xmlMemStopAtBlock == p->mh_number) xmlMallocBreakpoint();
 
     ret = HDR_2_CLIENT(p);
 
     if (xmlMemTraceBlockAt == ret) {
         xmlGenericError(xmlGenericErrorContext,
-                        "%p : Malloc(%ld) Ok\n", xmlMemTraceBlockAt, size);
+                        "%p : Malloc(%lu) Ok\n", xmlMemTraceBlockAt,
+                        (long unsigned)size);
         xmlMallocBreakpoint();
     }
 
     TEST_POINT
 
     return(ret);
 }
 
 /**
  * xmlMallocAtomicLoc:
@@ skipping 47 matching lines @@
     xmlGenericError(xmlGenericErrorContext,
             "Malloc(%d) Ok\n",size);
 #endif
 
     if (xmlMemStopAtBlock == p->mh_number) xmlMallocBreakpoint();
 
     ret = HDR_2_CLIENT(p);
 
     if (xmlMemTraceBlockAt == ret) {
         xmlGenericError(xmlGenericErrorContext,
-                        "%p : Malloc(%ld) Ok\n", xmlMemTraceBlockAt, size);
+                        "%p : Malloc(%lu) Ok\n", xmlMemTraceBlockAt,
+                        (long unsigned)size);
         xmlMallocBreakpoint();
     }
 
     TEST_POINT
 
     return(ret);
 }
 /**
  * xmlMemMalloc:
  * @size:  an int specifying the size in byte to allocate.
@@ skipping 17 matching lines @@
  * @line:  the line number
  *
  * a realloc() equivalent, with logging of the allocation info.
  *
  * Returns a pointer to the allocated area or NULL in case of lack of memory.
  */
 
 void *
 xmlReallocLoc(void *ptr,size_t size, const char * file, int line)
 {
-    MEMHDR *p;
+    MEMHDR *p, *tmp;
     unsigned long number;
 #ifdef DEBUG_MEMORY
     size_t oldsize;
 #endif
 
     if (ptr == NULL)
         return(xmlMallocLoc(size, file, line));
 
     if (!xmlMemInitialized) xmlInitMemory();
     TEST_POINT
@@ skipping 10 matching lines @@
     debugMemSize -= p->mh_size;
     debugMemBlocks--;
 #ifdef DEBUG_MEMORY
     oldsize = p->mh_size;
 #endif
 #ifdef MEM_LIST
     debugmem_list_delete(p);
 #endif
     xmlMutexUnlock(xmlMemMutex);
 
-    p = (MEMHDR *) realloc(p,RESERVE_SIZE+size);
-    if (!p) {
+    tmp = (MEMHDR *) realloc(p,RESERVE_SIZE+size);
+    if (!tmp) {
+         free(p);
          goto error;
     }
+    p = tmp;
     if (xmlMemTraceBlockAt == ptr) {
         xmlGenericError(xmlGenericErrorContext,
-                        "%p : Realloced(%ld -> %ld) Ok\n",
-                        xmlMemTraceBlockAt, p->mh_size, size);
+                        "%p : Realloced(%lu -> %lu) Ok\n",
+                        xmlMemTraceBlockAt, (long unsigned)p->mh_size,
+                        (long unsigned)size);
         xmlMallocBreakpoint();
     }
     p->mh_tag = MEMTAG;
     p->mh_number = number;
     p->mh_type = REALLOC_TYPE;
     p->mh_size = size;
     p->mh_file = file;
     p->mh_line = line;
     xmlMutexLock(xmlMemMutex);
     debugMemSize += size;
@@ skipping 139 matching lines @@
     if (debugMemSize > debugMaxMemSize) debugMaxMemSize = debugMemSize;
 #ifdef MEM_LIST
     debugmem_list_add(p);
 #endif
     xmlMutexUnlock(xmlMemMutex);
 
     s = (char *) HDR_2_CLIENT(p);
 
     if (xmlMemStopAtBlock == p->mh_number) xmlMallocBreakpoint();
 
-    if (s != NULL)
-      strcpy(s,str);
-    else
-      goto error;
+    strcpy(s,str);
 
     TEST_POINT
 
     if (xmlMemTraceBlockAt == s) {
         xmlGenericError(xmlGenericErrorContext,
                         "%p : Strdup() Ok\n", xmlMemTraceBlockAt);
         xmlMallocBreakpoint();
     }
 
     return(s);
@@ skipping 19 matching lines @@
 /**
  * xmlMemUsed:
  *
  * Provides the amount of memory currently allocated
  *
  * Returns an int representing the amount of memory allocated.
  */
 
 int
 xmlMemUsed(void) {
-     return(debugMemSize);
+    int res;
+
+    xmlMutexLock(xmlMemMutex);
+    res = debugMemSize;
+    xmlMutexUnlock(xmlMemMutex);
+    return(res);
 }
 
 /**
  * xmlMemBlocks:
  *
  * Provides the number of memory areas currently allocated
  *
  * Returns an int representing the number of blocks
  */
 
 int
 xmlMemBlocks(void) {
-     return(debugMemBlocks);
+    int res;
+
+    xmlMutexLock(xmlMemMutex);
+    res = debugMemBlocks;
+    xmlMutexUnlock(xmlMemMutex);
+    return(res);
 }
 
 #ifdef MEM_LIST
 /**
  * xmlMemContentShow:
  * @fp:  a FILE descriptor used as the output file
  * @p:  a memory block header
  *
  * tries to show some content from the memory block
  */
 
 static void
 xmlMemContentShow(FILE *fp, MEMHDR *p)
 {
-    int i,j,k,len = p->mh_size;
-    const char *buf = (const char *) HDR_2_CLIENT(p);
+    int i,j,k,len;
+    const char *buf;
 
     if (p == NULL) {
         fprintf(fp, " NULL");
         return;
     }
+    len = p->mh_size;
+    buf = (const char *) HDR_2_CLIENT(p);
 
     for (i = 0;i < len;i++) {
         if (buf[i] == 0) break;
         if (!isprint((unsigned char) buf[i])) break;
     }
     if ((i < 4) && ((buf[i] != 0) || (i == 0))) {
         if (len >= 4) {
             MEMHDR *q;
             void *cur;
 
@@ skipping 511 matching lines @@
     if (freeFunc != NULL) *freeFunc = xmlFree;
     if (mallocFunc != NULL) *mallocFunc = xmlMalloc;
     if (mallocAtomicFunc != NULL) *mallocAtomicFunc = xmlMallocAtomic;
     if (reallocFunc != NULL) *reallocFunc = xmlRealloc;
     if (strdupFunc != NULL) *strdupFunc = xmlMemStrdup;
     return(0);
 }
 
 #define bottom_xmlmemory
 #include "elfgcchack.h"