Commit32be1c8

committed

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

Per report from Jackie Chang

1 parenta0d8947 commit32be1c8Copy full SHA for 32be1c8

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

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);`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,7 @@ _LoadBlobs(ArchiveHandle AH, RestoreOptions ropt)`
`452`	`452`	`charfname[MAXPGPATH];`
`453`	`453`	`charpath[MAXPGPATH];`
`454`	`454`
	`455`	`+/* Can't overflow because line and fname are the same length. */`
`455`	`456`	`if (sscanf(line,"%u %s\n",&oid,fname)!=2)`
`456`	`457`	`exit_horribly(modulename,"invalid line in large object TOC file \"%s\": \"%s\"\n",`
`457`	`458`	`fname,line);`

Comments

(0)