TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't decrement zero-length REG_*SZ strings passed back from the registry

Browse Source
This commit is contained in:
Joseph Lee 2008-04-08 23:37:22 +00:00
parent c4b12b18cb
commit 543a6a3a7e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/express/windowsRegistry.cxx
View File

@ -304,8 +304,9 @@ do_get(const string &key, const string &name, int &data_type, string &data,
if (data_type == REG_SZ ||
data_type == REG_MULTI_SZ ||
data_type == REG_EXPAND_SZ) {
// Eliminate the trailing null character.
buffer_size--;
// Eliminate the trailing null character for non-zero lengths.
if (buffer_size > 0) // if zero, leave it
buffer_size--;
}
data = string(init_buffer, buffer_size);
@ -325,8 +326,9 @@ do_get(const string &key, const string &name, int &data_type, string &data,
if (data_type == REG_SZ ||
data_type == REG_MULTI_SZ ||
data_type == REG_EXPAND_SZ) {
// Eliminate the trailing null character.
buffer_size--;
// Eliminate the trailing null character for non-zero lengths.
if (buffer_size > 0) // if zero, leave it
buffer_size--;
}
data = string(new_buffer, buffer_size);
}