CVS User Account cvsuser
Mon Sep 26 22:49:23 PDT 2005
Log Message:
-----------
Per Ian Burrell...

"I just ran into a bug which crashes slonik when it is passed a file
which doesn't exist.  It looks like it was fixed on HEAD as part of
revision 1.43 on src/slonik/slonik.c. There are other changes in that
revision so I have extracted the relevant patch and appended it.  It
looks like it could be applied separately."

Tags:
----
REL_1_1_STABLE

Modified Files:
--------------
    slony1-engine/src/slonik:
        slonik.c (r1.42 -> r1.42.2.1)

-------------- next part --------------
Index: slonik.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -Lsrc/slonik/slonik.c -Lsrc/slonik/slonik.c -u -w -r1.42 -r1.42.2.1
--- src/slonik/slonik.c
+++ src/slonik/slonik.c
@@ -101,6 +101,12 @@
 			FILE	   *fp;
 
 			fp = fopen(argv[optind], "r");
+			if (fp == NULL) 
+			{
+				printf("could not open file '%s'\n",
+				       argv[optind]);
+				return -1;
+			}
 			scan_new_input_file(fp);
 			current_file = (char *)argv[optind++];
 			yylineno = 1;


More information about the Slony1-commit mailing list