nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00
Code Issues Projects Releases Wiki Activity

Rewrite some manual char-buffer-handling code.

Browse Source 
In the course of recent refactorings I noticed a couple of cases where
we were doing old-fashioned preallocation of a char array with some
conservative maximum size, then writing into it via *p++ or similar
and hoping we got the calculation right.

Now we have strbuf and dupcat, so we shouldn't ever have to do that.
Fixed as many cases as I could find by searching for allocations of
the form 'snewn(foo, char)'.

Particularly worth a mention was the Windows GSSAPI setup code, which
was directly using the Win32 Registry API, and looks much more legible
using the windows/utils/registry.c wrappers. (But that was why I had
to enhance them in the previous commit so as to be able to open
registry keys read-only: without that, the open operation would
actually fail on this key, which is not user-writable.)

Also unix/askpass.c, which was doing a careful reallocation of its
buffer to avoid secrets being left behind in the vacated memory -
which is now just a matter of ensuring we called strbuf_new_nm().
This commit is contained in:
Simon Tatham
2022-09-13 15:00:26 +01:00
parent 7339e00f4a
commit 6cf6682c54
13 changed files with 174 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
windows/controls.c
View File

@ -393,13 +393,11 @@ char *staticwrap(struct ctlpos *cp, HWND hwnd, const char *text, int *lines)
INT *pwidths, nfit;
SIZE size;
const char *p;
char *ret, *q;
RECT r;
HFONT oldfont, newfont;
ret = snewn(1+strlen(text), char);
strbuf *sb = strbuf_new();
p = text;
q = ret;
pwidths = snewn(1+strlen(text), INT);
/*
@ -432,7 +430,7 @@ char *staticwrap(struct ctlpos *cp, HWND hwnd, const char *text, int *lines)
* Either way, we stop wrapping, copy the remainder of
* the input string unchanged to the output, and leave.
*/
strcpy(q, p);
put_datapl(sb, ptrlen_from_asciz(p));
break;
}
@ -449,9 +447,8 @@ char *staticwrap(struct ctlpos *cp, HWND hwnd, const char *text, int *lines)
}
}
strncpy(q, p, nfit);
q[nfit] = '\n';
q += nfit+1;
put_data(sb, p, nfit);
put_byte(sb, '\n');
p += nfit;
while (*p && isspace((unsigned char)*p))
@ -467,7 +464,7 @@ char *staticwrap(struct ctlpos *cp, HWND hwnd, const char *text, int *lines)
sfree(pwidths);
return ret;
return strbuf_to_str(sb);
}
/*
@ -1181,30 +1178,24 @@ void progressbar(struct ctlpos *cp, int id)
*/
static char *shortcut_escape(const char *text, char shortcut)
{
char *ret;
char const *p;
char *q;
if (!text)
return NULL; /* sfree won't choke on this */
ret = snewn(2*strlen(text)+1, char); /* size potentially doubles! */
strbuf *sb = strbuf_new();
shortcut = tolower((unsigned char)shortcut);
p = text;
q = ret;
const char *p = text;
while (*p) {
if (shortcut != NO_SHORTCUT &&
tolower((unsigned char)*p) == shortcut) {
*q++ = '&';
put_byte(sb, '&');
shortcut = NO_SHORTCUT; /* stop it happening twice */
} else if (*p == '&') {
*q++ = '&';
put_byte(sb, '&');
}
*q++ = *p++;
put_byte(sb, *p++);
}
*q = '\0';
return ret;
return strbuf_to_str(sb);
}
void winctrl_add_shortcuts(struct dlgparam *dp, struct winctrl *c)