diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-01-11 04:49:18 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-01-11 04:49:18 +0000 |
commit | 09b97c074fd0416f4c3d3d895ac78cf6e6f78413 (patch) | |
tree | 5844897b72652df5e8d6922139124ba224c2c98b | |
parent | 9df60b4c472359d6d1a92fd62dd74feb002f14fc (diff) | |
download | netpbm-mirror-09b97c074fd0416f4c3d3d895ac78cf6e6f78413.tar.gz netpbm-mirror-09b97c074fd0416f4c3d3d895ac78cf6e6f78413.tar.xz netpbm-mirror-09b97c074fd0416f4c3d3d895ac78cf6e6f78413.zip |
Release 10.77.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2878 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | converter/other/svgtopam.c | 21 | ||||
-rw-r--r-- | doc/HISTORY | 5 | ||||
-rw-r--r-- | version.mk | 2 |
3 files changed, 23 insertions, 5 deletions
diff --git a/converter/other/svgtopam.c b/converter/other/svgtopam.c index a10f51da..09e3a24e 100644 --- a/converter/other/svgtopam.c +++ b/converter/other/svgtopam.c @@ -103,16 +103,23 @@ parseCommandLine(int argc, /*============================================================================ Wrappers for libxml2 routines. - The difference is that these use conventional C data types and have - shorter names. + The difference is that these use conventional C data types, have shorter + names, and abort the program instead of returning a special value when they + fail. =============================================================================*/ static const char * getAttribute(xmlTextReaderPtr const xmlReaderP, const char * const attributeName) { - return (const char *) + const char * const rc = (const char *) xmlTextReaderGetAttribute(xmlReaderP, (const xmlChar *)attributeName); + + if (rc == NULL) + pm_error("xmlTextReaderGetAttribute(\"%.256s\") failed. ", + attributeName); + + return rc; } @@ -120,7 +127,13 @@ getAttribute(xmlTextReaderPtr const xmlReaderP, static const char * currentNodeName(xmlTextReaderPtr const xmlReaderP) { - return (const char *)xmlTextReaderConstName(xmlReaderP); + const char * const rc = (const char *) + xmlTextReaderConstName(xmlReaderP); + + if (rc == NULL) + pm_error("xmlTextReaderConstName() failed. "); + + return rc; } diff --git a/doc/HISTORY b/doc/HISTORY index 177531b7..b4379b3c 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +17.01.11 BJH Release 10.77.01 + + svgtopam: Fix crash when out of memory. Always broken + (svgtopam was new in Netpbm 10.33 (March 2006)). + 16.12.25 BJH Release 10.77.00 pnmpad: fix bug: incorrect output width. Introduced in diff --git a/version.mk b/version.mk index 668be6b8..214296c5 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 77 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |