derick Sun Nov 17 14:40:38 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd/libgd gdft.c gdhelpers.c gdhelpers.h
Log:
- Fix memory problem for real this time.
Index: php4/ext/gd/libgd/gdft.c
diff -u php4/ext/gd/libgd/gdft.c:1.11.2.1 php4/ext/gd/libgd/gdft.c:1.11.2.2
--- php4/ext/gd/libgd/gdft.c:1.11.2.1 Sun Nov 17 08:10:36 2002
+++ php4/ext/gd/libgd/gdft.c Sun Nov 17 14:40:38 2002
@@ -347,7 +347,7 @@
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 @@
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 @@
{
/* 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.
Index: php4/ext/gd/libgd/gdhelpers.c
diff -u php4/ext/gd/libgd/gdhelpers.c:1.3 php4/ext/gd/libgd/gdhelpers.c:1.3.2.1
--- php4/ext/gd/libgd/gdhelpers.c:1.3 Tue Nov 12 11:02:03 2002
+++ php4/ext/gd/libgd/gdhelpers.c Sun Nov 17 14:40:38 2002
@@ -100,3 +100,9 @@
{
efree (ptr);
}
+
+char *
+gdEstrdup (const char *ptr)
+{
+ return estrdup(ptr);
+}
Index: php4/ext/gd/libgd/gdhelpers.h
diff -u php4/ext/gd/libgd/gdhelpers.h:1.2 php4/ext/gd/libgd/gdhelpers.h:1.2.2.1
--- php4/ext/gd/libgd/gdhelpers.h:1.2 Tue Oct 29 18:08:01 2002
+++ php4/ext/gd/libgd/gdhelpers.h Sun Nov 17 14:40:38 2002
@@ -14,6 +14,7 @@
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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
