github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2024-12-08 23:33:07 +01:00
Code Releases Activity

Land #128 : Fix unicode REG_EXPAND_SZ handling

Browse Source 
Fixes #127
This commit is contained in:
OJ 2016-09-30 14:39:36 +10:00
commit 4ba1d16acc
No known key found for this signature in database
GPG Key ID: D5DC61FB93260597
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
c/meterpreter/source/extensions/stdapi/server/sys/registry/registry.c
View File

@ -459,12 +459,16 @@ static void set_value(Remote *remote, Packet *packet, HKEY hkey)
} else {
// Now let's rock this shit!
void *buf;
size_t len = valueData.header.length;
if (valueType == REG_SZ) {
buf = utf8_to_wchar(valueData.buffer);
len = (wcslen(buf) + 1) * sizeof(wchar_t);
} else {
buf = valueData.buffer;
size_t len;
switch (valueType) {
case REG_SZ:
case REG_EXPAND_SZ:
buf = utf8_to_wchar(valueData.buffer);
len = (wcslen(buf) + 1) * sizeof(wchar_t);
break;
default:
len = valueData.header.length;
buf = valueData.buffer;
}
result = RegSetValueExW(hkey, valueName, 0, valueType, buf, (DWORD)len);
if (buf != valueData.buffer) {
@ -561,6 +565,7 @@ static void query_value(Remote *remote, Packet *packet, HKEY hkey)
switch (valueType) {
case REG_SZ:
case REG_EXPAND_SZ:
tmp = wchar_to_utf8((wchar_t *)valueData);
if (tmp) {
packet_add_tlv_string(response, TLV_TYPE_VALUE_DATA, tmp);