rolled back to 2.9.2 because 2.9.4 doesn't work with XML validator

[platform/upstream/libxml2.git] / xmlmemory.c

diff --git a/xmlmemory.c b/xmlmemory.c
index f08c8c3..a3dc737 100644 (file)
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -109,7 +109,6 @@ typedef struct memnod {
 #define RESERVE_SIZE (((HDR_SIZE + (ALIGN_SIZE-1)) \
                      / ALIGN_SIZE ) * ALIGN_SIZE)
 
-#define MAX_SIZE_T ((size_t)-1)
 
 #define CLIENT_2_HDR(a) ((MEMHDR *) (((char *) (a)) - RESERVE_SIZE))
 #define HDR_2_CLIENT(a)    ((void *) (((char *) (a)) + RESERVE_SIZE))
@@ -218,7 +217,7 @@ xmlMallocLoc(size_t size, const char * file, int line)
 
 /**
  * xmlMallocAtomicLoc:
- * @size:  an unsigned int specifying the size in byte to allocate.
+ * @size:  an int specifying the size in byte to allocate.
  * @file:  the file name or NULL
  * @line:  the line number
  *
@@ -241,18 +240,11 @@ xmlMallocAtomicLoc(size_t size, const char * file, int line)
 
     TEST_POINT
 
-    if (size > (MAX_SIZE_T - RESERVE_SIZE)) {
-       xmlGenericError(xmlGenericErrorContext,
-               "xmlMallocAtomicLoc : Unsigned overflow prevented\n");
-       xmlMemoryDump();
-       return(NULL);
-    }
-
     p = (MEMHDR *) malloc(RESERVE_SIZE+size);
 
     if (!p) {
        xmlGenericError(xmlGenericErrorContext,
-               "xmlMallocAtomicLoc : Out of free space\n");
+               "xmlMallocLoc : Out of free space\n");
        xmlMemoryDump();
        return(NULL);
     }
@@ -562,12 +554,7 @@ xmlMemoryStrdup(const char *str) {
 
 int
 xmlMemUsed(void) {
-    int res;
-
-    xmlMutexLock(xmlMemMutex);
-    res = debugMemSize;
-    xmlMutexUnlock(xmlMemMutex);
-    return(res);
+     return(debugMemSize);
 }
 
 /**
@@ -580,12 +567,7 @@ xmlMemUsed(void) {
 
 int
 xmlMemBlocks(void) {
-    int res;
-
-    xmlMutexLock(xmlMemMutex);
-    res = debugMemBlocks;
-    xmlMutexUnlock(xmlMemMutex);
-    return(res);
+     return(debugMemBlocks);
 }
 
 #ifdef MEM_LIST