fix null pointer access in get_tableoids_list()

funbringer · funbringer · commit c7c7d71eeecc · 2016-09-07T11:25:47.000+03:00
diff --git a/src/utils.c b/src/utils.c
@@ -101,9 +101,10 @@ get_tableoids_list(List *tlist)
 		if (!IsA(var, Var))
 			continue;
 
-		if (strlen(te->resname) > TABLEOID_STR_BASE_LEN &&
-			0 == strncmp(te->resname, TABLEOID_STR(""), TABLEOID_STR_BASE_LEN) &&
-			var->varoattno == TableOidAttributeNumber)
+		/* Check that column name begins with TABLEOID_STR & it's tableoid */
+		if (var->varoattno == TableOidAttributeNumber &&
+			(te->resname && strlen(te->resname) > TABLEOID_STR_BASE_LEN) &&
+			0 == strncmp(te->resname, TABLEOID_STR(""), TABLEOID_STR_BASE_LEN))
 		{
 			result = lappend(result, te);
 		}

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,10 @@ get_tableoids_list(List *tlist)`
`101`	`101`	`if (!IsA(var, Var))`
`102`	`102`	`continue;`
`103`	`103`
`104`		`- if (strlen(te->resname) > TABLEOID_STR_BASE_LEN &&`
`105`		`- 0 == strncmp(te->resname, TABLEOID_STR(""), TABLEOID_STR_BASE_LEN) &&`
`106`		`- var->varoattno == TableOidAttributeNumber)`
	`104`	`+ /* Check that column name begins with TABLEOID_STR & it's tableoid */`
	`105`	`+ if (var->varoattno == TableOidAttributeNumber &&`
	`106`	`+ (te->resname && strlen(te->resname) > TABLEOID_STR_BASE_LEN) &&`
	`107`	`+ 0 == strncmp(te->resname, TABLEOID_STR(""), TABLEOID_STR_BASE_LEN))`
`107`	`108`	`{`
`108`	`109`	`result = lappend(result, te);`
`109`	`110`	`}`