NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9fad4cb

Neil Conway

committed

Fix some minor infelicities in ecpg's pgtypeslib: (1) `pstr' must be

non-NULL in this function, so there is no need to check for it (2) weshould check the return value of pgtypes_strdup(). Patch from EricAstor at EnterpriseDB, with slight cleanup by myself, per a reportfrom the Coverity tool.

1 parent898a7bd commit9fad4cbCopy full SHA for 9fad4cb

File tree

1 file changed

-4

lines changed

src/interfaces/ecpg/pgtypeslib
- dt_common.c

1 file changed

-4

lines changed

`‎src/interfaces/ecpg/pgtypeslib/dt_common.c`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2669,8 +2669,7 @@ pgtypes_defmt_scan(union un_fmt_comb * scan_val, int scan_type, char **pstr, cha`
`2669`	`2669`	`if (!pstr_end)`
`2670`	`2670`	`{`
`2671`	`2671`	`/* there was an error, no match */`
`2672`		`-err=1;`
`2673`		`-returnerr;`
	`2672`	`+return1;`
`2674`	`2673`	`}`
`2675`	`2674`	`last_char=*pstr_end;`
`2676`	`2675`	`*pstr_end='\0';`
`@@ -2699,8 +2698,10 @@ pgtypes_defmt_scan(union un_fmt_comb * scan_val, int scan_type, char **pstr, cha`
`2699`	`2698`	`err=1;`
`2700`	`2699`	`break;`
`2701`	`2700`	`casePGTYPES_TYPE_STRING_MALLOCED:`
`2702`		`-if (pstr)`
`2703`		`-scan_val->str_val=pgtypes_strdup(*pstr);`
	`2701`	`+scan_val->str_val=pgtypes_strdup(*pstr);`
	`2702`	`+if (scan_val->str_val==NULL)`
	`2703`	`+err=1;`
	`2704`	`+break;`
`2704`	`2705`	`}`
`2705`	`2706`	`if (strtol_end&&*strtol_end)`
`2706`	`2707`	`*pstr=strtol_end;`

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!

Commit9fad4cb

File tree

1 file changed

1 file changed

`‎src/interfaces/ecpg/pgtypeslib/dt_common.c`

0 commit comments