NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit098dea8

committed

Fix core dump on \c.

1 parent656d88c commit098dea8Copy full SHA for 098dea8

File tree

1 file changed

+20

-15

lines changed

src/bin/psql
- psql.c

1 file changed

+20

-15

lines changed

`‎src/bin/psql/psql.c`

Lines changed: 20 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.65 1997/05/2401:45:17 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.66 1997/05/2414:38:05 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1088,7 +1088,7 @@ HandleSlashCmds(PsqlSettings * settings,`
`1088`	`1088`	`optarg=NULL;`
`1089`	`1089`
`1090`	`1090`	`blank_loc=strcspn(cmd," \t");`
`1091`		`-if (blank_loc==0)`
	`1091`	`+if (blank_loc==0\|\| !cmd[blank_loc])`
`1092`	`1092`	`optarg2=NULL;`
`1093`	`1093`	`else`
`1094`	`1094`	`optarg2=cmd+blank_loc+strspn(cmd+blank_loc," \t");`
`@@ -1114,31 +1114,36 @@ HandleSlashCmds(PsqlSettings * settings,`
`1114`	`1114`	`case'c':{`
`1115`	`1115`	`if (strncmp(cmd,"copy ",strlen("copy "))==0)`
`1116`	`1116`	`do_copy(optarg2,settings);`
`1117`		`-elseif (strncmp(cmd,"connect ",strlen("connect "))==0) {`
	`1117`	`+elseif (strncmp(cmd,"connect ",strlen("connect "))==0\|\|`
	`1118`	`+strcmp(cmd,"connect")==0/* issue error message */) {`
`1118`	`1119`	`char*optarg3;`
`1119`	`1120`	`intblank_loc2;`
`1120`	`1121`
`1121`		`-blank_loc2=strcspn(optarg2," \t");`
`1122`		`-if (blank_loc2==0\|\|*(optarg2+blank_loc2)=='\0')`
`1123`		`-optarg3=NULL;`
`1124`		`-else {`
`1125`		`-optarg3=optarg2+blank_loc2+`
	`1122`	`+if (optarg2) {`
	`1123`	`+blank_loc2=strcspn(optarg2," \t");`
	`1124`	`+if (blank_loc2==0\|\|*(optarg2+blank_loc2)=='\0')`
	`1125`	`+optarg3=NULL;`
	`1126`	`+else {`
	`1127`	`+optarg3=optarg2+blank_loc2+`
`1126`	`1128`	`strspn(optarg2+blank_loc2," \t");`
`1127`		`-*(optarg2+blank_loc2)='\0';`
	`1129`	`+*(optarg2+blank_loc2)='\0';`
	`1130`	`+ }`
`1128`	`1131`	`}`
`1129`	`1132`	`do_connect(optarg2,optarg3,settings);`
`1130`	`1133`	`}`
`1131`	`1134`	`else {`
`1132`	`1135`	`char*optarg3;`
`1133`	`1136`	`intblank_loc2;`
`1134`	`1137`
`1135`		`-blank_loc2=strcspn(optarg," \t");`
`1136`		`-if (blank_loc2==0\|\|*(optarg+blank_loc2)=='\0')`
`1137`		`-optarg3=NULL;`
`1138`		`-else {`
`1139`		`-optarg3=optarg+blank_loc2+`
	`1138`	`+if (optarg) {`
	`1139`	`+blank_loc2=strcspn(optarg," \t");`
	`1140`	`+if (blank_loc2==0\|\|*(optarg+blank_loc2)=='\0')`
	`1141`	`+optarg3=NULL;`
	`1142`	`+else {`
	`1143`	`+optarg3=optarg+blank_loc2+`
`1140`	`1144`	`strspn(optarg+blank_loc2," \t");`
`1141`		`-*(optarg+blank_loc2)='\0';`
	`1145`	`+*(optarg+blank_loc2)='\0';`
	`1146`	`+ }`
`1142`	`1147`	`}`
`1143`	`1148`	`do_connect(optarg,optarg3,settings);`
`1144`	`1149`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit098dea8

File tree

1 file changed

1 file changed

`‎src/bin/psql/psql.c`

0 commit comments