CVS User Account cvsuser
Mon Aug 30 21:24:49 PDT 2004
Log Message:
-----------
Fixed bug. Scan buffer must be zero-terminated.

Jan

Tags:
----
REL_1_0_STABLE

Modified Files:
--------------
    slony1-engine/src/slonik:
        scan.c (r1.17 -> r1.17.2.1)
        scan.l (r1.17 -> r1.17.2.1)

-------------- next part --------------
Index: scan.l
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/scan.l,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -Lsrc/slonik/scan.l -Lsrc/slonik/scan.l -u -w -r1.17 -r1.17.2.1
--- src/slonik/scan.l
+++ src/slonik/scan.l
@@ -143,6 +143,7 @@
 	{
 		dstring_nappend(&ds, buf, len);
 	}
+	dstring_terminate(&ds);
 	yy_switch_to_buffer(yy_scan_string(dstring_data(&ds)));
 
 	dstring_free(&ds);
Index: scan.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/scan.c,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -Lsrc/slonik/scan.c -Lsrc/slonik/scan.c -u -w -r1.17 -r1.17.2.1
--- src/slonik/scan.c
+++ src/slonik/scan.c
@@ -1,3 +1,4 @@
+#line 2 "scan.c"
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
@@ -619,6 +620,7 @@
 quoted_ident	(\"[^\"]*\")+
 identifier		({ident_start}{ident_cont}*|{quoted_ident})
 */
+#line 624 "scan.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -776,6 +778,7 @@
 
 	BEGIN(INITIAL);
 
+#line 782 "scan.c"
 
 	if ( yy_init )
 		{
@@ -1254,6 +1257,7 @@
 #line 129 "scan.l"
 ECHO;
 	YY_BREAK
+#line 1261 "scan.c"
 			case YY_STATE_EOF(INITIAL):
 			case YY_STATE_EOF(IN_STRING):
 				yyterminate();
@@ -2156,6 +2160,7 @@
 	{
 		dstring_nappend(&ds, buf, len);
 	}
+	dstring_terminate(&ds);
 	yy_switch_to_buffer(yy_scan_string(dstring_data(&ds)));
 
 	dstring_free(&ds);


More information about the Slony1-commit mailing list