Merge commit 'feadce8f1f1bbec0e86c51705f54d3fd48092d74' into PGPRO10

zilder · zilder · commit da44165338a6 · 2018-05-18T20:09:23.000+03:00
diff --git a/contrib/pg_pageprep/pg_pageprep.c b/contrib/pg_pageprep/pg_pageprep.c
@@ -1736,7 +1736,8 @@ our_intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
 	foreach(lc, into->options)
 	{
 		def = (DefElem *) lfirst(lc);
-		if (strcmp(def->defnamespace, "toast") == 0)
+		if (def->defnamespace &&
+			strcmp(def->defnamespace, "toast") == 0)
 			count++;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1736,7 +1736,8 @@ our_intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo)`
`1736`	`1736`	`foreach(lc, into->options)`
`1737`	`1737`	`{`
`1738`	`1738`	`def = (DefElem *) lfirst(lc);`
`1739`		`- if (strcmp(def->defnamespace, "toast") == 0)`
	`1739`	`+ if (def->defnamespace &&`
	`1740`	`+ strcmp(def->defnamespace, "toast") == 0)`
`1740`	`1741`	`count++;`
`1741`	`1742`	`}`
`1742`	`1743`