github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-03-27 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

* src/progress.c (prepare_filename): Replace zero-width mbc (\xe2\x80\x8b, ...)

Browse Source
This commit is contained in:
Вячеслав Петрищев 2020-01-04 13:24:43 +06:00 committed by Tim Rühsen
parent ec68da677f
commit 68548acf0f
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/progress.c
View File

@ -602,32 +602,33 @@ static void display_image (char *);
#if USE_NLS_PROGRESS_BAR #if USE_NLS_PROGRESS_BAR
static size_t static size_t
prepare_filename(char *dest, const char *src) prepare_filename (char *dest, const char *src)
{ {
size_t ret = 1; size_t ret = 1;
if (src) if (src)
{ {
mbi_iterator_t iter; mbi_iterator_t iter;
mbchar_t mbc; mbchar_t mbc;
mbi_init (iter, src, strlen(src)); mbi_init (iter, src, strlen (src));
while (mbi_avail (iter)) while (mbi_avail (iter))
{ {
size_t i; size_t i;
mbc = mbi_cur(iter); mbc = mbi_cur(iter);
if (mb_isprint(mbc)) /* replace invalid || unprintable || zero-width mbc ws hexdgt code */
{ if (!mb_isprint (mbc) || !mb_width (mbc))
if (dest) for (i=0; i < mb_len (mbc); i++)
for (i=0; i<mb_len(mbc); i++)
*dest++ = *(mb_ptr(mbc) + i);
ret += mb_len(mbc);
}
else
for (i=0; i<mb_len(mbc); i++)
{ {
if (dest) if (dest)
dest += sprintf(dest,"%%%02x", (unsigned char) *(mb_ptr(mbc) + i)); dest += sprintf (dest, "%%%02x", (unsigned char) *(mb_ptr(mbc) + i));
ret += 3; ret += 3;
} }
else
{
if (dest)
for (i=0; i < mb_len (mbc); i++)
*dest++ = *(mb_ptr (mbc) + i);
ret += mb_len (mbc);
}
mbi_advance (iter); mbi_advance (iter);
} }
} }
@ -638,14 +639,14 @@ prepare_filename(char *dest, const char *src)
#else #else
#include <ctype.h> #include <ctype.h>
static size_t static size_t
prepare_filename(char *dest, const char *src) prepare_filename (char *dest, const char *src)
{ {
size_t ret = 1; size_t ret = 1;
if (src) if (src)
while (*src) while (*src)
{ {
/* isprint with some lang return false for some chars */ /* isprint with some lang return false for some chars */
if(!iscntrl(*src)) if(!iscntrl (*src))
{ {
if (dest) if (dest)
*dest++ = *src; *dest++ = *src;
@ -654,7 +655,7 @@ prepare_filename(char *dest, const char *src)
else else
{ {
if (dest) if (dest)
dest += sprintf(dest,"%%%02x", (unsigned char) *src ); dest += sprintf (dest, "%%%02x", (unsigned char) *src );
ret += 3; ret += 3;
} }
src++; src++;
@ -677,7 +678,9 @@ bar_create (const char *f_download, wgint initial, wgint total)
bp->initial_length = initial; bp->initial_length = initial;
bp->total_length = total; bp->total_length = total;
/* replace unprintable chars and invalid sequences */ /* Zero-width mbc must be replaced to avoid buffer overflow.
Another way is to allocate a buffer that allows contain
full f_download, but in this case some escape sequences may break "bar" */
bp->f_download = xmalloc (prepare_filename (NULL, f_download)); bp->f_download = xmalloc (prepare_filename (NULL, f_download));
prepare_filename (bp->f_download, f_download); prepare_filename (bp->f_download, f_download);