lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-08-01 10:06:59 +03:00
Code Activity

better handling of error cases Daniel

Browse Source 
* xmlIO.c: better handling of error cases
Daniel
This commit is contained in:
Daniel Veillard
2003-10-08 18:58:28 +00:00
parent 05d987b462
commit 97bf4d02e5
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Oct 8 20:57:27 CEST 2003 Daniel Veillard <daniel@veillard.com>
* xmlIO.c: better handling of error cases
Wed Oct 8 13:51:14 CEST 2003 Daniel Veillard <daniel@veillard.com> Wed Oct 8 13:51:14 CEST 2003 Daniel Veillard <daniel@veillard.com>
* xmlIO.c xmllint.c include/libxml/xmlerror.h: first pass at * xmlIO.c xmllint.c include/libxml/xmlerror.h: first pass at

2
include/libxml/xmlIO.h
View File

@ -132,6 +132,7 @@ struct _xmlParserInputBuffer {
xmlBufferPtr buffer; /* Local buffer encoded in UTF-8 */ xmlBufferPtr buffer; /* Local buffer encoded in UTF-8 */
xmlBufferPtr raw; /* if encoder != NULL buffer for raw input */ xmlBufferPtr raw; /* if encoder != NULL buffer for raw input */
int compressed; /* -1=unknown, 0=not compressed, 1=compressed */ int compressed; /* -1=unknown, 0=not compressed, 1=compressed */
int error;
}; };
@ -146,6 +147,7 @@ struct _xmlOutputBuffer {
xmlBufferPtr buffer; /* Local buffer encoded in UTF-8 or ISOLatin */ xmlBufferPtr buffer; /* Local buffer encoded in UTF-8 or ISOLatin */
xmlBufferPtr conv; /* if encoder != NULL buffer for output */ xmlBufferPtr conv; /* if encoder != NULL buffer for output */
int written; /* total number of byte written */ int written; /* total number of byte written */
int error;
}; };
#endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_OUTPUT_ENABLED */

22
xmlIO.c
View File

@ -673,9 +673,10 @@ xmlFileWrite (void * context, const char * buffer, int len) {
int items; int items;
items = fwrite(&buffer[0], len, 1, (FILE *) context); items = fwrite(&buffer[0], len, 1, (FILE *) context);
if ((items == 0) && (ferror((FILE *) context))) if ((items == 0) && (ferror((FILE *) context))) {
xmlIOErr(0, "fwrite()"); xmlIOErr(0, "fwrite()");
return(-1);
}
return(items * len); return(items * len);
} }
#endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_OUTPUT_ENABLED */
@ -2471,6 +2472,7 @@ xmlParserInputBufferPush(xmlParserInputBufferPtr in,
int nbchars = 0; int nbchars = 0;
if (len < 0) return(0); if (len < 0) return(0);
if ((in == NULL) || (in->error)) return(-1);
if (in->encoder != NULL) { if (in->encoder != NULL) {
/* /*
* Store the data in the incoming raw buffer * Store the data in the incoming raw buffer
@ -2486,6 +2488,7 @@ xmlParserInputBufferPush(xmlParserInputBufferPtr in,
nbchars = xmlCharEncInFunc(in->encoder, in->buffer, in->raw); nbchars = xmlCharEncInFunc(in->encoder, in->buffer, in->raw);
if (nbchars < 0) { if (nbchars < 0) {
xmlIOErr(XML_IO_ENCODER, NULL); xmlIOErr(XML_IO_ENCODER, NULL);
in->error = XML_IO_ENCODER;
return(-1); return(-1);
} }
} else { } else {
@ -2536,12 +2539,14 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
int buffree; int buffree;
unsigned int needSize; unsigned int needSize;
if ((in == NULL) || (in->error)) return(-1);
if ((len <= MINLEN) && (len != 4)) if ((len <= MINLEN) && (len != 4))
len = MINLEN; len = MINLEN;
buffree = in->buffer->size - in->buffer->use; buffree = in->buffer->size - in->buffer->use;
if (buffree <= 0) { if (buffree <= 0) {
xmlIOErr(XML_IO_BUFFER_FULL, NULL); xmlIOErr(XML_IO_BUFFER_FULL, NULL);
in->error = XML_IO_BUFFER_FULL;
return(0); return(0);
} }
@ -2549,6 +2554,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
if (needSize > in->buffer->size){ if (needSize > in->buffer->size){
if (!xmlBufferResize(in->buffer, needSize)){ if (!xmlBufferResize(in->buffer, needSize)){
xmlIOErrMemory("growing input buffer"); xmlIOErrMemory("growing input buffer");
in->error = XML_ERR_NO_MEMORY;
return(0); return(0);
} }
} }
@ -2563,6 +2569,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
in->readcallback = endOfInput; in->readcallback = endOfInput;
} else { } else {
xmlIOErr(XML_IO_NO_INPUT, NULL); xmlIOErr(XML_IO_NO_INPUT, NULL);
in->error = XML_IO_NO_INPUT;
return(-1); return(-1);
} }
if (res < 0) { if (res < 0) {
@ -2584,6 +2591,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
nbchars = xmlCharEncInFunc(in->encoder, in->buffer, in->raw); nbchars = xmlCharEncInFunc(in->encoder, in->buffer, in->raw);
if (nbchars < 0) { if (nbchars < 0) {
xmlIOErr(XML_IO_ENCODER, NULL); xmlIOErr(XML_IO_ENCODER, NULL);
in->error = XML_IO_ENCODER;
return(-1); return(-1);
} }
} else { } else {
@ -2613,7 +2621,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
*/ */
int int
xmlParserInputBufferRead(xmlParserInputBufferPtr in, int len) { xmlParserInputBufferRead(xmlParserInputBufferPtr in, int len) {
/* xmlBufferEmpty(in->buffer); */ if ((in == NULL) || (in->error)) return(-1);
if (in->readcallback != NULL) if (in->readcallback != NULL)
return(xmlParserInputBufferGrow(in, len)); return(xmlParserInputBufferGrow(in, len));
else if ((in->buffer != NULL) && else if ((in->buffer != NULL) &&
@ -2645,7 +2653,9 @@ xmlOutputBufferWrite(xmlOutputBufferPtr out, int len, const char *buf) {
int written = 0; /* number of char written to I/O so far */ int written = 0; /* number of char written to I/O so far */
int chunk; /* number of byte curreent processed from buf */ int chunk; /* number of byte curreent processed from buf */
if ((out == NULL) || (out->error)) return(-1);
if (len < 0) return(0); if (len < 0) return(0);
if (out->error) return(-1);
do { do {
chunk = len; chunk = len;
@ -2673,6 +2683,7 @@ xmlOutputBufferWrite(xmlOutputBufferPtr out, int len, const char *buf) {
ret = xmlCharEncOutFunc(out->encoder, out->conv, out->buffer); ret = xmlCharEncOutFunc(out->encoder, out->conv, out->buffer);
if ((ret < 0) && (ret != -3)) { if ((ret < 0) && (ret != -3)) {
xmlIOErr(XML_IO_ENCODER, NULL); xmlIOErr(XML_IO_ENCODER, NULL);
out->error = XML_IO_ENCODER;
return(-1); return(-1);
} }
nbchars = out->conv->use; nbchars = out->conv->use;
@ -2703,6 +2714,7 @@ xmlOutputBufferWrite(xmlOutputBufferPtr out, int len, const char *buf) {
} }
if (ret < 0) { if (ret < 0) {
xmlIOErr(XML_IO_WRITE, NULL); xmlIOErr(XML_IO_WRITE, NULL);
out->error = XML_IO_WRITE;
return(ret); return(ret);
} }
out->written += ret; out->written += ret;
@ -2735,6 +2747,7 @@ int
xmlOutputBufferWriteString(xmlOutputBufferPtr out, const char *str) { xmlOutputBufferWriteString(xmlOutputBufferPtr out, const char *str) {
int len; int len;
if ((out == NULL) || (out->error)) return(-1);
if (str == NULL) if (str == NULL)
return(-1); return(-1);
len = strlen(str); len = strlen(str);
@ -2756,6 +2769,7 @@ int
xmlOutputBufferFlush(xmlOutputBufferPtr out) { xmlOutputBufferFlush(xmlOutputBufferPtr out) {
int nbchars = 0, ret = 0; int nbchars = 0, ret = 0;
if ((out == NULL) || (out->error)) return(-1);
/* /*
* first handle encoding stuff. * first handle encoding stuff.
*/ */
@ -2766,6 +2780,7 @@ xmlOutputBufferFlush(xmlOutputBufferPtr out) {
nbchars = xmlCharEncOutFunc(out->encoder, out->conv, out->buffer); nbchars = xmlCharEncOutFunc(out->encoder, out->conv, out->buffer);
if (nbchars < 0) { if (nbchars < 0) {
xmlIOErr(XML_IO_ENCODER, NULL); xmlIOErr(XML_IO_ENCODER, NULL);
out->error = XML_IO_ENCODER;
return(-1); return(-1);
} }
} }
@ -2787,6 +2802,7 @@ xmlOutputBufferFlush(xmlOutputBufferPtr out) {
} }
if (ret < 0) { if (ret < 0) {
xmlIOErr(XML_IO_FLUSH, NULL); xmlIOErr(XML_IO_FLUSH, NULL);
out->error = XML_IO_FLUSH;
return(ret); return(ret);
} }
out->written += ret; out->written += ret;