NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit9d91cd8

committed

Fix latent crash in do_text_output_multiline().

do_text_output_multiline() would fail (typically with a null pointerdereference crash) if its input string did not end with a newline. Suchcases do not arise in our current sources; but it certainly could happenin future, or in extension code's usage of the function, so we should fixit. To fix, replace "eol += len" with "eol = text + len".While at it, make two cosmetic improvements: mark the input string const,and rename the argument from "text" to "txt" to dodge pgindent strangeness(since "text" is a typedef name).Even though this problem is only latent at present, it seems like a goodidea to back-patch the fix, since it's a very simple/safe patch and it'snot out of the realm of possibility that we might in future back-patchsomething that expects sane behavior from do_text_output_multiline().Per report from Hao Lee.Report: <CAGoxFiFPAGyPAJLcFxTB5cGhTW2yOVBDYeqDugYwV4dEd1L_Ag@mail.gmail.com>

1 parent7fc5064 commit9d91cd8Copy full SHA for 9d91cd8

File tree

2 files changed

+10

-11

lines changed

src
- backend/executor
  - execTuples.c
- include/executor
  - executor.h

2 files changed

+10

-11

lines changed

`‎src/backend/executor/execTuples.c`

Lines changed: 9 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1325,33 +1325,32 @@ do_tup_output(TupOutputState tstate, Datum values, bool *isnull)`
`1325`	`1325`	`* Should only be used with a single-TEXT-attribute tupdesc.`
`1326`	`1326`	`*/`
`1327`	`1327`	`void`
`1328`		`-do_text_output_multiline(TupOutputStatetstate,chartext)`
	`1328`	`+do_text_output_multiline(TupOutputStatetstate,constchartxt)`
`1329`	`1329`	`{`
`1330`	`1330`	`Datumvalues[1];`
`1331`	`1331`	`boolisnull[1]= {false};`
`1332`	`1332`
`1333`		`-while (*text)`
	`1333`	`+while (*txt)`
`1334`	`1334`	`{`
`1335`		`-char*eol;`
	`1335`	`+constchar*eol;`
`1336`	`1336`	`intlen;`
`1337`	`1337`
`1338`		`-eol=strchr(text,'\n');`
	`1338`	`+eol=strchr(txt,'\n');`
`1339`	`1339`	`if (eol)`
`1340`	`1340`	`{`
`1341`		`-len=eol-text;`
`1342`		`-`
	`1341`	`+len=eol-txt;`
`1343`	`1342`	`eol++;`
`1344`	`1343`	`}`
`1345`	`1344`	`else`
`1346`	`1345`	`{`
`1347`		`-len=strlen(text);`
`1348`		`-eol+=len;`
	`1346`	`+len=strlen(txt);`
	`1347`	`+eol=txt+len;`
`1349`	`1348`	`}`
`1350`	`1349`
`1351`		`-values[0]=PointerGetDatum(cstring_to_text_with_len(text,len));`
	`1350`	`+values[0]=PointerGetDatum(cstring_to_text_with_len(txt,len));`
`1352`	`1351`	`do_tup_output(tstate,values,isnull);`
`1353`	`1352`	`pfree(DatumGetPointer(values[0]));`
`1354`		`-text=eol;`
	`1353`	`+txt=eol;`
`1355`	`1354`	`}`
`1356`	`1355`	`}`
`1357`	`1356`

`‎src/include/executor/executor.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ typedef struct TupOutputState`
`283`	`283`	`externTupOutputStatebegin_tup_output_tupdesc(DestReceiverdest,`
`284`	`284`	`TupleDesctupdesc);`
`285`	`285`	`externvoiddo_tup_output(TupOutputStatetstate,Datumvalues,bool*isnull);`
`286`		`-externvoiddo_text_output_multiline(TupOutputStatetstate,chartext);`
	`286`	`+externvoiddo_text_output_multiline(TupOutputStatetstate,constchartxt);`
`287`	`287`	`externvoidend_tup_output(TupOutputState*tstate);`
`288`	`288`
`289`	`289`	`/*`

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!

Commit9d91cd8

File tree

2 files changed

2 files changed

`‎src/backend/executor/execTuples.c`

`‎src/include/executor/executor.h`

0 commit comments