Fix: Rewritre sys realloc function

goo/gmem.cc

@@ -6,7 +6,7 @@
  * Copyright 1996-2003 Glyph & Cog, LLC
  */
 
- #include "../aconf.h"
+#include "../aconf.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -22,6 +22,16 @@
 #endif
 #include "../goo/gmem.h"
 
+#ifdef __MINT__
+#include "../mint_alloc.h"
+#endif
+
+// #ifdef __MINT__
+
+// #else
+
+// #endif
+
 #ifdef DEBUG_MEM
 
 typedef struct _GMemHdr {
@@ -145,9 +155,15 @@ void *gmalloc(int size) GMEM_EXCEP {
   if (size == 0) {
     return NULL;
   }
+#ifdef __MINT__
+  if (!(p = gmint_malloc(size))) {
+    gMemError("Out of memory");
+  }
+#else
   if (!(p = malloc(size))) {
     gMemError("Out of memory");
   }
+#endif 
   return p;
 }
 #endif
@@ -185,15 +201,27 @@ void *grealloc(void *p, int size) GMEM_EXCEP {
   }
   if (size == 0) {
     if (p) {
+#ifdef __MINT__
+      gmint_free(p);
+#else
       free(p);
+#endif      
     }
     return NULL;
   }
+#ifdef __MINT__
+  if (p) {
+    q = gmint_realloc(p, size);
+  } else {
+    q = gmint_malloc(size);
+  }
+#else
   if (p) {
     q = realloc(p, size);
   } else {
     q = malloc(size);
   }
+#endif  
   if (!q) {
     gMemError("Out of memory");
   }
@@ -268,9 +296,16 @@ void *gmalloc64(size_t size) GMEM_EXCEP {
   if (size == 0) {
     return NULL;
   }
+#ifdef __MINT__
+  if (!(p = gmint_malloc(size))) {
+    gMemError("Out of memory");
+  }
+#else
   if (!(p = malloc(size))) {
     gMemError("Out of memory");
   }
+#endif  
+
   return p;
 }
 #endif
@@ -344,11 +379,18 @@ void gfree(void *p) {
       fprintf(stderr, "Attempted to free bad address %p\n", p);
     }
   }
+#else
+#ifdef __MINT__
+  if (p) {
+    gmint_free(p);
+  }
 #else
   if (p) {
     free(p);
   }
 #endif
+
+#endif
 }
 
 void gMemError(const char *msg) GMEM_EXCEP {

mint_alloc.h

@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <mintbind.h>
+
+void gmint_free(void * p);
+void * gmint_malloc(size_t n);
+size_t gmint_getsize(void * p);
+void *gmint_realloc(void *ptr,size_t size);
+
+void gmint_free(void * p) {
+    size_t * in = (size_t *)p;
+    if (in) {
+        --in; Mfree(in);
+    }
+}
+
+void * gmint_malloc(size_t n) {
+    size_t * result = (size_t *)Mxalloc(n + sizeof(size_t), 3);
+    if (result) { *result = n; ++result; memset(result,0,n); }
+    return result;
+}
+
+size_t gmint_getsize(void * p) {
+    size_t * in = (size_t *)p;
+    if (in) { --in; return *in; }
+    return -1;
+}
+
+void *gmint_realloc(void *ptr,size_t size) {
+    void *newptr;
+    int msize;
+    msize = gmint_getsize(ptr);
+    // printf("msize=%d\n", msize);
+    if (size <= msize)
+        return ptr;
+    newptr = gmint_malloc(size);
+    memcpy(newptr, ptr, msize);
+    gmint_free(ptr);
+    return newptr;
+}

xpdf/CharCodeToUnicode.cc

@@ -674,13 +674,16 @@ void CharCodeToUnicode::setMapping(CharCode c, Unicode *u, int len) {
 int CharCodeToUnicode::mapToUnicode(CharCode c, Unicode *u, int size) {
   int i, j;
 
-  if (!map) {
-    u[0] = (Unicode)c;
-    return 1;
-  }
-  if (c >= mapLen) {
+/*Add returned flag for no mapping found.*/
+  // if (!map) {
+  //   u[0] = (Unicode)c;
+  //   return 1;
+  // }
+  if (c >= mapLen || !map) {
     return 0;
   }
+  //AA : when no mapping 0 is default, to be catched later for recognition
+  u[0] = map[c];
   if (map[c]) {
     u[0] = map[c];
     return 1;

xpdf/GlobalParams.cc

@@ -747,7 +747,9 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
   launchCommand = NULL;
   movieCommand = NULL;
   defaultPrinter = NULL;
-  mapNumericCharNames = gTrue;
+  /*Deactivate mappings using numeric charnames since they are not reliable and use unverified heuristic to be resolved. */
+  // mapNumericCharNames = gTrue;
+  mapNumericCharNames = gFalse;
   mapUnknownCharNames = gFalse;
   mapExtTrueTypeFontsViaUnicode = gTrue;
   useTrueTypeUnicodeMapping = gFalse;