NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0a9118c

committed

ecpg: Fix error handling on OOMs when parsing timestamps

pgtypes_alloc() can return NULL when failing an allocation, which issomething that PGTYPEStimestamp_defmt_asc() has forgotten about whentranslating a timestamp for 'D', 'r', 'R' and 'T' as these require atemporary allocation.This is unlikely going to be a problem in practice, so no backpatch isdone.Author: Oleg TselebrovskiyDiscussion:https://postgr.es/m/bf47888585149f83b276861a1662f7e4@postgrespro.ru

1 parenta6c2188 commit0a9118cCopy full SHA for 0a9118c

File tree

1 file changed

-0

lines changed

src/interfaces/ecpg/pgtypeslib
- dt_common.c

1 file changed

-0

lines changed

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

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2659,6 +2659,8 @@ PGTYPEStimestamp_defmt_scan(char *str, char fmt, timestamp * d,`
`2659`	`2659`	`*/`
`2660`	`2660`	`pfmt++;`
`2661`	`2661`	`tmp=pgtypes_alloc(strlen("%m/%d/%y")+strlen(pstr)+1);`
	`2662`	`+if (!tmp)`
	`2663`	`+return1;`
`2662`	`2664`	`strcpy(tmp,"%m/%d/%y");`
`2663`	`2665`	`strcat(tmp,pfmt);`
`2664`	`2666`	`err=PGTYPEStimestamp_defmt_scan(&pstr,tmp,d,year,month,day,hour,minute,second,tz);`
`@@ -2784,6 +2786,8 @@ PGTYPEStimestamp_defmt_scan(char *str, char fmt, timestamp * d,`
`2784`	`2786`	`case'r':`
`2785`	`2787`	`pfmt++;`
`2786`	`2788`	`tmp=pgtypes_alloc(strlen("%I:%M:%S %p")+strlen(pstr)+1);`
	`2789`	`+if (!tmp)`
	`2790`	`+return1;`
`2787`	`2791`	`strcpy(tmp,"%I:%M:%S %p");`
`2788`	`2792`	`strcat(tmp,pfmt);`
`2789`	`2793`	`err=PGTYPEStimestamp_defmt_scan(&pstr,tmp,d,year,month,day,hour,minute,second,tz);`
`@@ -2792,6 +2796,8 @@ PGTYPEStimestamp_defmt_scan(char *str, char fmt, timestamp * d,`
`2792`	`2796`	`case'R':`
`2793`	`2797`	`pfmt++;`
`2794`	`2798`	`tmp=pgtypes_alloc(strlen("%H:%M")+strlen(pstr)+1);`
	`2799`	`+if (!tmp)`
	`2800`	`+return1;`
`2795`	`2801`	`strcpy(tmp,"%H:%M");`
`2796`	`2802`	`strcat(tmp,pfmt);`
`2797`	`2803`	`err=PGTYPEStimestamp_defmt_scan(&pstr,tmp,d,year,month,day,hour,minute,second,tz);`
`@@ -2837,6 +2843,8 @@ PGTYPEStimestamp_defmt_scan(char *str, char fmt, timestamp * d,`
`2837`	`2843`	`case'T':`
`2838`	`2844`	`pfmt++;`
`2839`	`2845`	`tmp=pgtypes_alloc(strlen("%H:%M:%S")+strlen(pstr)+1);`
	`2846`	`+if (!tmp)`
	`2847`	`+return1;`
`2840`	`2848`	`strcpy(tmp,"%H:%M:%S");`
`2841`	`2849`	`strcat(tmp,pfmt);`
`2842`	`2850`	`err=PGTYPEStimestamp_defmt_scan(&pstr,tmp,d,year,month,day,hour,minute,second,tz);`

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!

Commit0a9118c

File tree

1 file changed

1 file changed

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

0 commit comments