NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit3eb1bc6

Thomas G. Lockhart

committed

Check explicitly for valid input strings for both TRUE and FALSE.

Allow true/false, yes/no, 1/0. Throw elog warning if anything else.Allow shorter strings, so "t", "tr", "tru" and "true" match "true".Old behavior accepted anything starting with "t" as TRUE, everything else as FALSE.

1 parent200bc52 commit3eb1bc6Copy full SHA for 3eb1bc6

File tree

1 file changed

+19

-12

lines changed

src/backend/utils/adt
- bool.c

1 file changed

+19

-12

lines changed

`‎src/backend/utils/adt/bool.c‎`

Lines changed: 19 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,12 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.8 1997/10/17 05:38:32 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.9 1997/10/25 05:09:58 thomas Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
	`15`	`+#include<string.h>`
`15`	`16`	`#include"postgres.h"`
`16`	`17`
`17`	`18`	`#include"utils/builtins.h"/* where the declarations go */`
`@@ -26,10 +27,6 @@`
`26`	`27`	`*`
`27`	`28`	`* Check explicitly for "true/false" and TRUE/FALSE, 1/0, YES/NO.`
`28`	`29`	`* Reject other values. - thomas 1997-10-05`
`29`		`- * For now, allow old behavior of everything FALSE if not TRUE.`
`30`		`- * After v6.2.1 release, then enable code to reject goofy values.`
`31`		`- * Also, start checking the entire string rather than just the first character.`
`32`		`- * - thomas 1997-10-16`
`33`	`30`	`*`
`34`	`31`	`* In the switch statement, check the most-used possibilities first.`
`35`	`32`	`*/`
`@@ -39,33 +36,43 @@ boolin(char *b)`
`39`	`36`	`switch(*b) {`
`40`	`37`	`case't':`
`41`	`38`	`case'T':`
`42`		`-return (TRUE);`
	`39`	`+if (strncasecmp(b,"true",strlen(b))==0)`
	`40`	`+return (TRUE);`
`43`	`41`	`break;`
`44`	`42`
`45`	`43`	`case'f':`
`46`	`44`	`case'F':`
`47`		`-return (FALSE);`
	`45`	`+if (strncasecmp(b,"false",strlen(b))==0)`
	`46`	`+return (FALSE);`
`48`	`47`	`break;`
`49`	`48`
`50`	`49`	`case'y':`
`51`	`50`	`case'Y':`
	`51`	`+if (strncasecmp(b,"yes",strlen(b))==0)`
	`52`	`+return (TRUE);`
	`53`	`+break;`
	`54`	`+`
`52`	`55`	`case'1':`
`53`		`-return (TRUE);`
	`56`	`+if (strncasecmp(b,"1",strlen(b))==0)`
	`57`	`+return (TRUE);`
`54`	`58`	`break;`
`55`	`59`
`56`	`60`	`case'n':`
`57`	`61`	`case'N':`
	`62`	`+if (strncasecmp(b,"no",strlen(b))==0)`
	`63`	`+return (FALSE);`
	`64`	`+break;`
	`65`	`+`
`58`	`66`	`case'0':`
`59`		`-return (FALSE);`
	`67`	`+if (strncasecmp(b,"0",strlen(b))==0)`
	`68`	`+return (FALSE);`
`60`	`69`	`break;`
`61`	`70`
`62`	`71`	`default:`
`63`		`-#ifFALSE`
`64`		`-elog(WARN,"Invalid input string '%s'\n",b);`
`65`		`-#endif`
`66`	`72`	`break;`
`67`	`73`	`}`
`68`	`74`
	`75`	`+elog(WARN,"Invalid input string '%s'\n",b);`
`69`	`76`	`return (FALSE);`
`70`	`77`	`}/* boolin() */`
`71`	`78`

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!

Commit3eb1bc6

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/bool.c‎`

0 commit comments