Log Message:
-----------
MFH slonik segfault when no comment, prevent duplicate table/sequence

Tags:
----
REL_1_0_STABLE

Modified Files:
--------------
    slony1-engine/src/backend:
        slony1_base.sql (r1.13 -> r1.13.2.1)
    slony1-engine/src/slonik:
        dbutil.c (r1.6 -> r1.6.2.1)

-------------- next part --------------
Index: slony1_base.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/slony1_base.sql,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -Lsrc/backend/slony1_base.sql -Lsrc/backend/slony1_base.sql -u -w -r1.13 -r1.13.2.1
--- src/backend/slony1_base.sql
+++ src/backend/slony1_base.sql
@@ -73,7 +73,7 @@
 -- ----------------------------------------------------------------------
 create table @NAMESPACE at .sl_table (
 	tab_id				int4,
-	tab_reloid			oid,
+	tab_reloid			oid UNIQUE NOT NULL,
 	tab_set				int4,
 	tab_idxname			name NOT NULL,
 	tab_altered			boolean NOT NULL,
@@ -108,7 +108,7 @@
 -- ----------------------------------------------------------------------
 create table @NAMESPACE at .sl_sequence (
 	seq_id				int4,
-	seq_reloid			oid,
+	seq_reloid			oid UNIQUE NOT NULL,
 	seq_set				int4,
 	seq_comment			text,
 
Index: dbutil.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/dbutil.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -Lsrc/slonik/dbutil.c -Lsrc/slonik/dbutil.c -u -w -r1.6 -r1.6.2.1
--- src/slonik/dbutil.c
+++ src/slonik/dbutil.c
@@ -618,7 +618,7 @@
 								break;
 
 					case 'q':	s = va_arg(ap, char *);
-								while (*s != '\0')
+								while (s && *s != '\0')
 								{
 									switch (*s)
 									{