Restore fullname[] contents before falling through in pg_open_tzfile().

tglsfdc · tglsfdc · commit 5788a5670e4a · 2017-05-07T11:34:31.000-04:00
Fix oversight in commit af2c5aa: if the shortcut open() doesn't work, we need to reset fullname[] to be just the name of the toplevel tzdata directory before we fall through into the pre-existing code. This failed to be exposed in my (tgl's) testing because the fall-through path is actually never taken under normal circumstances. David Rowley, per report from Amit Kapila Discussion: https://postgr.es/m/CAA4eK1LC7CaNhRAQ__C3ht1JVrPzaAXXhEJRnR5L6bfYHiLmWw@mail.gmail.com
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
@@ -105,6 +105,7 @@ pg_open_tzfile(const char *name, char *canonname)
 		if (result >= 0)
 			return result;
 		/* If that didn't work, fall through to do it the hard way */
+		fullname[fullnamelen] = '\0';
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ pg_open_tzfile(const char name, char canonname)`
`105`	`105`	`if (result >= 0)`
`106`	`106`	`return result;`
`107`	`107`	`/* If that didn't work, fall through to do it the hard way */`
	`108`	`+ fullname[fullnamelen] = '\0';`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`/*`