aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv.c14
-rw-r--r--iconv/gconv_open.c8
-rw-r--r--iconv/gconv_simple.c110
-rw-r--r--iconv/loop.c6
-rw-r--r--iconv/skeleton.c9
5 files changed, 74 insertions, 73 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c
index aa58bdba7d..24dc21e2c2 100644
--- a/iconv/gconv.c
+++ b/iconv/gconv.c
@@ -51,19 +51,9 @@ __gconv (gconv_t cd, const char **inbuf, const char *inbufend, char **outbuf,
do
{
- /* See whether the input size is reasoable for the output
- size. If not adjust it. */
- size_t inlen = ((inbufend - *inbuf) / cd->steps->max_needed_from
- * cd->steps->max_needed_from);
-
- if (cd->nsteps > 1)
- inlen = MIN (inlen, (((outbufend - cd->data[last_step].outbuf)
- / cd->steps[last_step].max_needed_to)
- * cd->steps[last_step].max_needed_to));
-
last_start = *inbuf;
- result = (*cd->steps->fct) (cd->steps, cd->data, inbuf,
- *inbuf + inlen, converted, 0);
+ result = (*cd->steps->fct) (cd->steps, cd->data, inbuf, inbufend,
+ converted, 0);
}
while (result == GCONV_EMPTY_INPUT && last_start != *inbuf
&& *inbuf + cd->steps->min_needed_from <= inbufend);
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index 831794fc22..d7e0191cca 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -71,14 +71,16 @@ __gconv_open (const char *toset, const char *fromset, gconv_t *handle)
/* Allocate the buffer. */
if (!data[cnt].is_last)
{
- data[cnt].outbuf =
- (char *) malloc (GCONV_NCHAR_GOAL
- * steps[cnt].max_needed_to);
+ size_t size = (GCONV_NCHAR_GOAL
+ * steps[cnt].max_needed_to);
+
+ data[cnt].outbuf = (char *) malloc (size);
if (data[cnt].outbuf == NULL)
{
res = GCONV_NOMEM;
break;
}
+ data[cnt].outbufend = data[cnt].outbuf + size;
}
}
}
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index f2fec12fb8..95b4a66daf 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -181,7 +181,7 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
#define LOOPFCT FROM_LOOP
#define BODY \
{ \
- if (*((uint32_t *) inptr) > '\x7f') \
+ if (*((uint32_t *) inptr) > 0x7f) \
{ \
/* This is no correct ANSI_X3.4-1968 character. */ \
result = GCONV_ILLEGAL_INPUT; \
@@ -208,6 +208,7 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
+#define MAX_NEEDED_OUTPUT MAX_NEEDED_TO
#define LOOPFCT FROM_LOOP
#define BODY \
{ \
@@ -266,6 +267,7 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
#define FUNCTION_NAME __gconv_transform_utf8_internal
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
+#define MAX_NEEDED_INPUT MAX_NEEDED_FROM
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
#define LOOPFCT FROM_LOOP
#define BODY \
@@ -278,69 +280,75 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
ch = *inptr; \
\
if (ch < 0x80) \
- /* One byte sequence. */ \
- cnt = 1; \
- else if ((ch & 0xe0) == 0xc0) \
{ \
- cnt = 2; \
- ch &= 0x1f; \
- } \
- else if ((ch & 0xf0) == 0xe0) \
- { \
- /* We expect three bytes. */ \
- cnt = 3; \
- ch &= 0x0f; \
- } \
- else if ((ch & 0xf8) == 0xf0) \
- { \
- /* We expect four bytes. */ \
- cnt = 4; \
- ch &= 0x07; \
- } \
- else if ((ch & 0xfc) == 0xf8) \
- { \
- /* We expect five bytes. */ \
- cnt = 5; \
- ch &= 0x03; \
- } \
- else if ((ch & 0xfe) == 0xfc) \
- { \
- /* We expect six bytes. */ \
- cnt = 6; \
- ch &= 0x01; \
+ /* One byte sequence. */ \
+ cnt = 1; \
+ ++inptr; \
} \
else \
{ \
- /* This is an illegal encoding. */ \
- result = GCONV_ILLEGAL_INPUT; \
- break; \
- } \
- \
- if (NEED_LENGTH_TEST && inptr + cnt >= inend) \
- { \
- /* We don't have enough input. */ \
- result = GCONV_INCOMPLETE_INPUT; \
- break; \
- } \
- \
- /* Read the possible remaining bytes. */ \
- for (i = 1; i < cnt; ++i) \
- { \
- uint32_t byte = inptr[i]; \
- \
- if ((byte & 0xc0) != 0x80) \
+ if ((ch & 0xe0) == 0xc0) \
+ { \
+ cnt = 2; \
+ ch &= 0x1f; \
+ } \
+ else if ((ch & 0xf0) == 0xe0) \
+ { \
+ /* We expect three bytes. */ \
+ cnt = 3; \
+ ch &= 0x0f; \
+ } \
+ else if ((ch & 0xf8) == 0xf0) \
+ { \
+ /* We expect four bytes. */ \
+ cnt = 4; \
+ ch &= 0x07; \
+ } \
+ else if ((ch & 0xfc) == 0xf8) \
+ { \
+ /* We expect five bytes. */ \
+ cnt = 5; \
+ ch &= 0x03; \
+ } \
+ else if ((ch & 0xfe) == 0xfc) \
+ { \
+ /* We expect six bytes. */ \
+ cnt = 6; \
+ ch &= 0x01; \
+ } \
+ else \
{ \
/* This is an illegal encoding. */ \
result = GCONV_ILLEGAL_INPUT; \
break; \
} \
\
- ch <<= 6; \
- ch |= byte & 0x3f; \
+ if (NEED_LENGTH_TEST && inptr + cnt > inend) \
+ { \
+ /* We don't have enough input. */ \
+ result = GCONV_INCOMPLETE_INPUT; \
+ break; \
+ } \
+ \
+ /* Read the possible remaining bytes. */ \
+ for (i = 1; i < cnt; ++i) \
+ { \
+ uint32_t byte = inptr[i]; \
+ \
+ if ((byte & 0xc0) != 0x80) \
+ { \
+ /* This is an illegal encoding. */ \
+ result = GCONV_ILLEGAL_INPUT; \
+ break; \
+ } \
+ \
+ ch <<= 6; \
+ ch |= byte & 0x3f; \
+ } \
+ inptr += cnt; \
} \
\
/* Now adjust the pointers and store the result. */ \
- inptr += cnt; \
*((uint32_t *) outptr)++ = ch; \
}
#include <iconv/loop.c>
diff --git a/iconv/loop.c b/iconv/loop.c
index b8657d574c..e1c1ab6e49 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -32,8 +32,6 @@
bytes needed. It defaults to MIN_NEEDED_INPUT
MAX_NEEDED_OUTPUT likewise for output bytes.
- Both values have a default of 1.
-
LOOPFCT name of the function created. If not specified
the name is `loop' but this prevents the use
of multiple functions in the same file.
@@ -55,7 +53,7 @@
/* We need at least one byte for the next round. */
#ifndef MIN_NEEDED_INPUT
-# define MIN_NEEDED_INPUT 1
+# error "MIN_NEEDED_INPUT definition missing"
#endif
/* Let's see how many bytes we produce. */
@@ -65,7 +63,7 @@
/* We produce at least one byte in the next round. */
#ifndef MIN_NEEDED_OUTPUT
-# define MIN_NEEDED_OUTPUT 1
+# error "MIN_NEEDED_OUTPUT definition missing"
#endif
/* Let's see how many bytes we produce. */
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 3582f14110..f905bcdaea 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -196,6 +196,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
/* This variable is used to count the number of characters we
actually converted. */
size_t converted = 0;
+ size_t last_converted;
/* We preserve the initial values of the pointer variables. */
const char *inptr = *inbuf;
@@ -211,6 +212,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
outptr = outbuf;
/* Save the state. */
+ last_converted = converted;
#ifdef SAVE_RESET_STATE
SAVE_RESET_STATE (1);
#endif
@@ -242,7 +244,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
/* Write out all output which was produced. */
if (outbuf > outptr)
{
- const char *outerr = outbuf;
+ const char *outerr = data->outbuf;
int result;
result = (*fct) (next_step, next_data, &outerr, outbuf,
@@ -264,6 +266,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
outbuf = outptr;
/* Reset the state. */
+ converted = last_converted;
# ifdef SAVE_RESET_STATE
SAVE_RESET_STATE (0);
# endif
@@ -287,8 +290,8 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
/* We must run out of output buffer space in this
rerun. */
- assert (nstatus == GCONV_FULL_OUTPUT
- && outbuf == outerr);
+ assert (outbuf == outerr);
+ assert (nstatus == GCONV_FULL_OUTPUT);
#endif /* reset input buffer */
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 20:45:43 +0000