Commitc851884

committed

Unbreak \h; can't do strlen(NULL).

This was broken by the following commmit. Although the original commit wasbackpatched all the way to 7.4, this particular bug exists only in the versionapplied to HEAD.http://archives.postgresql.org/pgsql-committers/2010-05/msg00058.php

1 parent15ab0e9 commitc851884Copy full SHA for c851884

File tree

-5

lines changed

-5

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2010, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.219 2010/05/08 16:39:51 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.220 2010/05/21 17:37:44 rhaas Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -654,10 +654,14 @@ exec_command(const char *cmd,`
`654`	`654`	`size_tlen;`
`655`	`655`
`656`	`656`	`/* strip any trailing spaces and semicolons */`
`657`		`-len=strlen(opt);`
`658`		`-while (len>0&&`
`659`		`- (isspace((unsignedchar)opt[len-1])\|\|opt[len-1]==';'))`
`660`		`-opt[--len]='\0';`
	`657`	`+if (opt)`
	`658`	`+{`
	`659`	`+len=strlen(opt);`
	`660`	`+while (len>0&&`
	`661`	`+ (isspace((unsignedchar)opt[len-1])`
	`662`	`+\|\|opt[len-1]==';'))`
	`663`	`+opt[--len]='\0';`
	`664`	`+}`
`661`	`665`
`662`	`666`	`helpSQL(opt,pset.popt.topt.pager);`
`663`	`667`	`free(opt);`

Comments

(0)