Remove use of sscanf in pg_upgrade, and add C comment to pg_dump

bmomjian · bmomjian · commit 32be1c8e900b · 2014-02-15T11:50:56.000-05:00
Per report from Jackie Chang
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
@@ -453,9 +453,10 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)
 					sscanf(line, "%hu", &old_cluster.port);
 				if (lineno == LOCK_FILE_LINE_SOCKET_DIR)
 				{
-					cluster->sockdir = pg_malloc(MAXPGPATH);
+					cluster->sockdir = pg_strdup(line);
 					/* strip off newline */
-					sscanf(line, "%s\n", cluster->sockdir);
+					if (strchr(cluster->sockdir, '\n') != NULL)
+						*strchr(cluster->sockdir, '\n') = '\0';
 				}
 			}
 			fclose(fp);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
@@ -452,6 +452,7 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
 		char		fname[MAXPGPATH];
 		char		path[MAXPGPATH];
 
+		/* Can't overflow because line and fname are the same length. */
 		if (sscanf(line, "%u %s\n", &oid, fname) != 2)
 			exit_horribly(modulename, "invalid line in large object TOC file \"%s\": \"%s\"\n",
 						  fname, line);

Original file line number	Diff line number	Diff line change
`@@ -453,9 +453,10 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)`
`453`	`453`	`sscanf(line, "%hu", &old_cluster.port);`
`454`	`454`	`if (lineno == LOCK_FILE_LINE_SOCKET_DIR)`
`455`	`455`	`{`
`456`		`- cluster->sockdir = pg_malloc(MAXPGPATH);`
	`456`	`+ cluster->sockdir = pg_strdup(line);`
`457`	`457`	`/* strip off newline */`
`458`		`- sscanf(line, "%s\n", cluster->sockdir);`
	`458`	`+ if (strchr(cluster->sockdir, '\n') != NULL)`
	`459`	`+ *strchr(cluster->sockdir, '\n') = '\0';`
`459`	`460`	`}`
`460`	`461`	`}`
`461`	`462`	`fclose(fp);`