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