NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0edef16

committed

Defend against null error message reported by libxml2.

While this isn't really supposed to happen, it can occur in OOMsituations and perhaps others. Instead of crashing, substitute"(no message provided)".I didn't worry about localizing this text, since we aren'tlocalizing anything else here; besides, if we're on the edge ofOOM, it's unlikely gettext() would work.Report and fix by Sergio Conde Gómez in bug #15624.Discussion:https://postgr.es/m/15624-4dea54091a2864e6@postgresql.org

1 parentf10a20e commit0edef16Copy full SHA for 0edef16

File tree

1 file changed

-1

lines changed

src/backend/utils/adt
- xml.c

1 file changed

-1

lines changed

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

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1697,7 +1697,10 @@ xml_errorHandler(void *data, xmlErrorPtr error)`
`1697`	`1697`	`appendStringInfo(errorBuf,"line %d: ",error->line);`
`1698`	`1698`	`if (name!=NULL)`
`1699`	`1699`	`appendStringInfo(errorBuf,"element %s: ",name);`
`1700`		`-appendStringInfoString(errorBuf,error->message);`
	`1700`	`+if (error->message!=NULL)`
	`1701`	`+appendStringInfoString(errorBuf,error->message);`
	`1702`	`+else`
	`1703`	`+appendStringInfoString(errorBuf,"(no message provided)");`
`1701`	`1704`
`1702`	`1705`	`/*`
`1703`	`1706`	`* Append context information to errorBuf.`

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!

Commit0edef16

File tree

1 file changed

1 file changed

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

0 commit comments