[Pkg-php-commits] r1091 - in php5/trunk/debian: . patches

Raphael Geissert atomo64-guest at alioth.debian.org
Sat May 31 21:35:19 UTC 2008


tags 483461 pending
thanks

Author: atomo64-guest
Date: 2008-05-31 21:35:18 +0000 (Sat, 31 May 2008)
New Revision: 1091

Added:
   php5/trunk/debian/patches/tzdb-nofree_ents_ifnotzdata.patch
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/series
Log:
tzdb-nofree_ents_ifnotzdata.patch: avoid free'ing ents when the tz dir does
not exist (Closes: #483461)


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-05-27 19:54:17 UTC (rev 1090)
+++ php5/trunk/debian/changelog	2008-05-31 21:35:18 UTC (rev 1091)
@@ -14,8 +14,10 @@
     + Previous change reverted because of lots of FTBFS from the PEAR packages
   * php.ini-*: state that when using a custom save_path,
     gc_probability should also be set (Closes: #388808, #321460)
+  * tzdb-nofree_ents_ifnotzdata.patch: avoid free'ing ents when the tz dir does
+    not exist (Closes: #483461)
 
- -- Raphael Geissert <atomo64 at gmail.com>  Sun, 25 May 2008 13:24:08 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Sat, 31 May 2008 16:30:34 -0500
 
 php5 (5.2.6-1) unstable; urgency=medium
 

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2008-05-27 19:54:17 UTC (rev 1090)
+++ php5/trunk/debian/patches/series	2008-05-31 21:35:18 UTC (rev 1091)
@@ -31,3 +31,4 @@
 use_embedded_timezonedb.patch
 manpage_spelling.patch
 force_libmysqlclient_r.patch
+tzdb-nofree_ents_ifnotzdata.patch

Added: php5/trunk/debian/patches/tzdb-nofree_ents_ifnotzdata.patch
===================================================================
--- php5/trunk/debian/patches/tzdb-nofree_ents_ifnotzdata.patch	                        (rev 0)
+++ php5/trunk/debian/patches/tzdb-nofree_ents_ifnotzdata.patch	2008-05-31 21:35:18 UTC (rev 1091)
@@ -0,0 +1,13 @@
+Index: php5-5.2.6/ext/date/lib/parse_tz.c
+===================================================================
+--- php5-5.2.6.orig/ext/date/lib/parse_tz.c
++++ php5-5.2.6/ext/date/lib/parse_tz.c
+@@ -311,7 +311,7 @@ static void create_zone_index(timelib_tz
+ 			free(ents[--count]);
+ 		}
+ 		
+-		free(ents);
++		if (count != -1) free(ents);
+ 		free(top);
+ 	} while (dirstack_top);
+ 




More information about the Pkg-php-commits mailing list