NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitcccbdde

committed

Be more careful about signed vs. unsigned char

The buildfarm has reminded me that not all systems consider char to besigned and we need to be explicit. Adjust the various bits of mac8.cfor what we intend, mostly using casts to unsigned char as suggested byTom, and adjust the tests for valid input accordingly. Explicitly makethe hexlookup table signed as it's useful to use -1 there to indicate aninvalid value.

1 parent7821f72 commitcccbddeCopy full SHA for cccbdde

File tree

1 file changed

+14

-14

lines changed

src/backend/utils/adt
- mac8.c

1 file changed

+14

-14

lines changed

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

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@`
`35`	`35`	`#definelobits(addr) \`
`36`	`36`	`((unsigned long)(((addr)->e<<24) \| ((addr)->f<<16) \| ((addr)->g<<8) \| ((addr)->h)))`
`37`	`37`
`38`		`-staticunsignedcharhex2_to_uchar(constcharstr,constcharptr);`
	`38`	`+staticunsignedcharhex2_to_uchar(constunsignedcharstr,constunsignedcharptr);`
`39`	`39`
`40`		`-staticconstcharhexlookup[128]= {`
	`40`	`+staticconstsignedcharhexlookup[128]= {`
`41`	`41`	`-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,`
`42`	`42`	`-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,`
`43`	`43`	`-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,`
`@@ -58,16 +58,16 @@ static const char hexlookup[128] = {`
`58`	`58`	`* the entire string, which is used only for error reporting.`
`59`	`59`	`*/`
`60`	`60`	`staticinlineunsignedchar`
`61`		`-hex2_to_uchar(constcharptr,constcharstr)`
	`61`	`+hex2_to_uchar(constunsignedcharptr,constunsignedcharstr)`
`62`	`62`	`{`
`63`	`63`	`unsignedcharret=0;`
`64`		`-charlookup;`
	`64`	`+signedcharlookup;`
`65`	`65`
`66`	`66`	`/* Handle the first character */`
`67`		`-if (*ptr<0)`
	`67`	`+if (*ptr>127)`
`68`	`68`	`gotoinvalid_input;`
`69`	`69`
`70`		`-lookup=hexlookup[(unsignedchar)*ptr];`
	`70`	`+lookup=hexlookup[*ptr];`
`71`	`71`	`if (lookup<0)`
`72`	`72`	`gotoinvalid_input;`
`73`	`73`
`@@ -76,10 +76,10 @@ hex2_to_uchar(const char ptr, const char str)`
`76`	`76`	`/* Move to the second character */`
`77`	`77`	`ptr++;`
`78`	`78`
`79`		`-if (*ptr<0)`
	`79`	`+if (*ptr>127)`
`80`	`80`	`gotoinvalid_input;`
`81`	`81`
`82`		`-lookup=hexlookup[(unsignedchar)*ptr];`
	`82`	`+lookup=hexlookup[*ptr];`
`83`	`83`	`if (lookup<0)`
`84`	`84`	`gotoinvalid_input;`
`85`	`85`
`@@ -103,8 +103,8 @@ hex2_to_uchar(const char ptr, const char str)`
`103`	`103`	`Datum`
`104`	`104`	`macaddr8_in(PG_FUNCTION_ARGS)`
`105`	`105`	`{`
`106`		`-constchar*str=PG_GETARG_CSTRING(0);`
`107`		`-constchar*ptr=str;`
	`106`	`+constunsignedcharstr= (unsignedchar)PG_GETARG_CSTRING(0);`
	`107`	`+constunsignedchar*ptr=str;`
`108`	`108`	`macaddr8*result;`
`109`	`109`	`unsignedchara=0,`
`110`	`110`	`b=0,`
`@@ -115,10 +115,10 @@ macaddr8_in(PG_FUNCTION_ARGS)`
`115`	`115`	`g=0,`
`116`	`116`	`h=0;`
`117`	`117`	`intcount=0;`
`118`		`-charspacer='\0';`
	`118`	`+unsignedcharspacer='\0';`
`119`	`119`
`120`	`120`	`/* skip leading spaces */`
`121`		`-while (ptr&&isspace((unsignedchar)ptr))`
	`121`	`+while (ptr&&isspace(ptr))`
`122`	`122`	`ptr++;`
`123`	`123`
`124`	`124`	`/* digits must always come in pairs */`
`@@ -191,9 +191,9 @@ macaddr8_in(PG_FUNCTION_ARGS)`
`191`	`191`	`/* allow trailing whitespace after if we have 6 or 8 bytes */`
`192`	`192`	`if (count==6\|\|count==8)`
`193`	`193`	`{`
`194`		`-if (isspace((unsignedchar)*ptr))`
	`194`	`+if (isspace(*ptr))`
`195`	`195`	`{`
`196`		`-while (++ptr&&isspace((unsignedchar)ptr));`
	`196`	`+while (++ptr&&isspace(ptr));`
`197`	`197`
`198`	`198`	`/* If we found a space and then non-space, it's invalid */`
`199`	`199`	`if (*ptr)`

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!

Commitcccbdde

File tree

1 file changed

1 file changed

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

0 commit comments