OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 01-Dec-2004 22:07:40 Branch: HEAD Handle: 2004120121073900 Modified files: openpkg-src/flex flex.patch flex.spec Log: fix a free(0) possibility as catched by dmalloc Summary: Revision Changes Path 1.16 +21 -10 openpkg-src/flex/flex.patch 1.75 +1 -1 openpkg-src/flex/flex.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/flex/flex.patch ============================================================================ $ cvs diff -u -r1.15 -r1.16 flex.patch --- openpkg-src/flex/flex.patch 31 Oct 2004 19:24:20 -0000 1.15 +++ openpkg-src/flex/flex.patch 1 Dec 2004 21:07:39 -0000 1.16 @@ -1,6 +1,6 @@ Index: doc/flex.texi --- doc/flex.texi.orig 2003-03-27 19:02:59 +0100 -+++ doc/flex.texi 2004-10-31 20:15:39 +0100 ++++ doc/flex.texi 2004-12-01 22:01:52 +0100 @@ -3804,6 +3804,7 @@ @example @verbatim @@ -67,7 +67,7 @@ Index: filter.c --- filter.c.orig 2003-03-25 17:39:08 +0100 -+++ filter.c 2004-10-31 20:15:39 +0100 ++++ filter.c 2004-12-01 22:01:52 +0100 @@ -158,10 +158,21 @@ int r; @@ -105,7 +105,7 @@ } Index: flex.skl --- flex.skl.orig 2003-04-01 03:51:38 +0200 -+++ flex.skl 2004-10-31 20:15:39 +0100 ++++ flex.skl 2004-12-01 22:06:21 +0100 @@ -345,19 +345,19 @@ %# yyscan_t yyscanner; %# @@ -209,7 +209,18 @@ } %endif ]]) -@@ -3280,7 +3294,6 @@ +@@ -2777,8 +2791,10 @@ + m4_ifdef( [[M4_YY_DESTROY_START_STACK]], + [[ + /* Destroy the start condition stack. */ ++ if (YY_G(yy_start_stack) != NULL) { + yyfree( YY_G(yy_start_stack) M4_YY_CALL_LAST_ARG ); + YY_G(yy_start_stack) = NULL; ++ } + ]]) + + m4_ifdef( [[M4_YY_USES_REJECT]], +@@ -3280,7 +3296,6 @@ #undef yy_set_bol #undef yy_new_buffer #undef yy_set_interactive @@ -219,7 +230,7 @@ #ifdef YY_DECL_IS_OURS Index: gen.c --- gen.c.orig 2003-03-30 21:58:44 +0200 -+++ gen.c 2004-10-31 20:15:39 +0100 ++++ gen.c 2004-12-01 22:01:52 +0100 @@ -1812,7 +1812,6 @@ if (yytext_is_array) { if (!reentrant){ @@ -230,7 +241,7 @@ } Index: main.c --- main.c.orig 2003-04-01 03:51:38 +0200 -+++ main.c 2004-10-31 20:20:01 +0100 ++++ main.c 2004-12-01 22:01:52 +0100 @@ -199,6 +199,7 @@ { #if ENABLE_NLS @@ -366,7 +377,7 @@ else { Index: scan.c --- scan.c.orig 2003-04-01 18:33:17 +0200 -+++ scan.c 2004-10-31 20:15:40 +0100 ++++ scan.c 2004-12-01 22:01:53 +0100 @@ -1,5 +1,6 @@ +#line 2 "scan.c" @@ -431,7 +442,7 @@ #ifdef YY_DECL_IS_OURS Index: scan.l --- scan.l.orig 2003-04-01 03:51:38 +0200 -+++ scan.l 2004-10-31 20:15:39 +0100 ++++ scan.l 2004-12-01 22:01:52 +0100 @@ -350,7 +350,7 @@ stack ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense ); stdinit do_stdinit = option_sense; @@ -443,7 +454,7 @@ warn nowarn = ! option_sense; Index: skel.c --- skel.c.orig 2003-04-01 18:33:08 +0200 -+++ skel.c 2004-10-31 20:15:39 +0100 ++++ skel.c 2004-12-01 22:01:52 +0100 @@ -404,19 +404,19 @@ "%# yyscan_t yyscanner;", "%#", @@ -549,7 +560,7 @@ "]])", Index: tables.c --- tables.c.orig 2002-11-27 15:43:24 +0100 -+++ tables.c 2004-10-31 20:15:39 +0100 ++++ tables.c 2004-12-01 22:01:52 +0100 @@ -86,7 +86,7 @@ th->th_magic = YYTBL_MAGIC; th->th_hsize = 14 + strlen (version_str) + 1 + strlen (name) + 1; @@ . patch -p0 <<'@@ .' Index: openpkg-src/flex/flex.spec ============================================================================ $ cvs diff -u -r1.74 -r1.75 flex.spec --- openpkg-src/flex/flex.spec 31 Oct 2004 18:47:16 -0000 1.74 +++ openpkg-src/flex/flex.spec 1 Dec 2004 21:07:39 -0000 1.75 @@ -39,7 +39,7 @@ Group: Language License: BSD Version: %{V_new} -Release: 20041031 +Release: 20041201 # list of sources Source0: http://osdn.dl.sourceforge.net/sourceforge/lex/flex-%{V_new}.tar.gz @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]