Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 1e755594 1e75559474e8d8a062a4f869f6421e6dee181cd3 by Sergey Poznyakoff
Options

(internal_icvt_read,copy_octal): Fixed memory allocation errors.

1 parent fc577d5c
Inline Side-by-side
Showing 1 changed file with 6 additions and 2 deletions
......@@ -204,6 +204,7 @@ internal_icvt_read (stream_t stream, char *optr, size_t osize, size_t *pnbytes)
char *p = realloc (s->buf, s->bufsize + 128);
if (!p)
return ENOMEM;
s->buf = p;
s->bufsize += 128;
}
continue;
......@@ -255,7 +256,10 @@ copy_octal (struct icvt_stream *s, char *optr, size_t osize, size_t *pnbytes)
/* Try to reallocate temp buffer */
char *p = realloc (s->buf, rdcount);
if (p)
s->bufsize = rdcount;
{
s->bufsize = rdcount;
s->buf = p;
}
else
rdcount = s->bufsize;
}
......@@ -279,7 +283,7 @@ copy_octal (struct icvt_stream *s, char *optr, size_t osize, size_t *pnbytes)
{
if (ISPRINT (*(unsigned char*)(s->buf+i)))
optr[j++] = s->buf[i];
else if (j + 4 >= s->bufpos)
else if (j + 4 >= osize)
break;
else
{
......