summaryrefslogtreecommitdiff
path: root/encoding.c
diff options
context:
space:
mode:
authorMike Hommey <glandium@debian.org>2005-04-04 18:23:13 +0000
committerMike Hommey <glandium@debian.org>2005-04-04 18:23:13 +0000
commit0fc063df3ab2ad380d532d210dd1001de473e51b (patch)
tree6f88f0a0f845dd6aec7807b18cb5618d93e159ac /encoding.c
parent50e5b428562964b1eb2f876370058b34b47c5e90 (diff)
downloadlibxml2-0fc063df3ab2ad380d532d210dd1001de473e51b.tar.gz
Load /tmp/tmp.98zkCi/libxml2-2.6.19 intoupstream/2.6.19
packages/libxml2/branches/upstream/current.
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c
index a3dad07..66e63b5 100644
--- a/encoding.c
+++ b/encoding.c
@@ -2332,7 +2332,7 @@ ISO8859xToUTF8(unsigned char* out, int *outlen,
unsigned char* outend;
const unsigned char* instart = in;
const unsigned char* inend;
- const unsigned char* instop = inend;
+ const unsigned char* instop;
unsigned int c;
if ((out == NULL) || (outlen == NULL) || (inlen == NULL) ||
@@ -2340,6 +2340,7 @@ ISO8859xToUTF8(unsigned char* out, int *outlen,
return(-1);
outend = out + *outlen;
inend = in + *inlen;
+ instop = inend;
c = *in;
while (in < inend && out < outend - 1) {
if (c >= 0x80) {
@@ -3260,4 +3261,6 @@ xmlRegisterCharEncodingHandlersISO8859x (void) {
#endif
#endif
+#define bottom_encoding
+#include "elfgcchack.h"