ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regedit: Fix char escaping for registry export.

This commit is contained in:
Alexander Nicolaysen Sørnes 2008-09-21 23:20:42 +02:00 committed by Alexandre Julliard
parent e46e095c22
commit 1e0a77622b
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
programs/regedit/regproc.c
View File

@ -885,7 +885,7 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD
DWORD i; DWORD i;
DWORD extra = 0; DWORD extra = 0;
REGPROC_resize_char_buffer(line_buf, line_buf_size, len + 10); REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + 10);
/* escaping characters */ /* escaping characters */
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@ -895,37 +895,36 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD
{ {
const WCHAR escape[] = {'\\','\\'}; const WCHAR escape[] = {'\\','\\'};
REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1);
memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR));
extra++; extra++;
REGPROC_resize_char_buffer(line_buf, line_buf_size, len + extra);
memcpy(*line_buf + *line_size - 1, escape, 2 * sizeof(WCHAR));
break; break;
} }
case '\"': case '"':
{ {
const WCHAR escape[] = {'\\','"'}; const WCHAR escape[] = {'\\','"'};
REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1);
memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR));
extra++; extra++;
REGPROC_resize_char_buffer(line_buf, line_buf_size, len + extra);
memcpy(*line_buf + *line_size - 1, escape, 2 * sizeof(WCHAR));
break; break;
} }
case '\n': case '\n':
{ {
const WCHAR escape[] = {'\\','\n'}; const WCHAR escape[] = {'\\','n'};
REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1);
memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR));
extra++; extra++;
REGPROC_resize_char_buffer(line_buf, line_buf_size, len + extra);
memcpy(*line_buf + *line_size - 1, escape, 2 * sizeof(WCHAR));
break; break;
} }
default: default:
memcpy(*line_buf + *line_size - 1, &c, sizeof(WCHAR)); memcpy(*line_buf + *line_size + i + extra - 1, &c, sizeof(WCHAR));
break; break;
} }
*line_size += 1;
} }
*line_size += len + extra;
*(*line_buf + *line_size - 1) = 0; *(*line_buf + *line_size - 1) = 0;
*line_size += extra;
} }
/****************************************************************************** /******************************************************************************