- MFB

3 files changed, 10 insertions, 3 deletions

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index cfc3bdf7cc..022604b6ad 100644
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -347,7 +347,7 @@ fontFetch (char **error, void *key)
   FT_CharMap charmap;
 
   a = (font_t *) gdMalloc (sizeof (font_t));
-  a->fontlist = estrdup (b->fontlist);
+  a->fontlist = gdEstrdup (b->fontlist);
   a->library = b->library;
 
   /*
@@ -356,7 +356,7 @@ fontFetch (char **error, void *key)
   fontsearchpath = getenv ("GDFONTPATH");
   if (!fontsearchpath)
     fontsearchpath = DEFAULT_FONTPATH;
-  fontlist = estrdup (a->fontlist);
+  fontlist = gdEstrdup (a->fontlist);
 
   /*
    * Must use gd_strtok_r else pointer corrupted by strtok in nested loop.
@@ -366,7 +366,7 @@ fontFetch (char **error, void *key)
     {
 
       /* make a fresh copy each time - strtok corrupts it. */
-      path = estrdup (fontsearchpath);
+      path = gdEstrdup (fontsearchpath);
       /*
        * Allocate an oversized buffer that is guaranteed to be
        * big enough for all paths to be tested.
diff --git a/ext/gd/libgd/gdhelpers.c b/ext/gd/libgd/gdhelpers.c
index 6f01872deb..32620e8551 100644
--- a/ext/gd/libgd/gdhelpers.c
+++ b/ext/gd/libgd/gdhelpers.c
@@ -100,3 +100,9 @@ gdFree (void *ptr)
 {
   efree (ptr);
 }
+
+char *
+gdEstrdup (const char *ptr)
+{
+  return estrdup(ptr);
+}
diff --git a/ext/gd/libgd/gdhelpers.h b/ext/gd/libgd/gdhelpers.h
index fdc690a2ec..5b27638783 100644
--- a/ext/gd/libgd/gdhelpers.h
+++ b/ext/gd/libgd/gdhelpers.h
@@ -14,6 +14,7 @@ extern char *gd_strtok_r(char *s, char *sep, char **state);
 void *gdCalloc(size_t nmemb, size_t size);
 void *gdMalloc(size_t size);
 void *gdRealloc(void *ptr, size_t size);
+char *gdEstrdup(const char *ptr);
 
 #endif /* GDHELPERS_H */