External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XPath: Several variable fixes

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@678 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-08-29 15:37:03 +00:00
parent 1230502989
commit c66ffdf720
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pugixml.cpp
View File

@ -5346,6 +5346,11 @@ namespace
struct xpath_variable_string: xpath_variable struct xpath_variable_string: xpath_variable
{ {
~xpath_variable_string()
{
if (value) global_deallocate(value);
}
char_t* value; char_t* value;
char_t name[1]; char_t name[1];
}; };
@ -5381,7 +5386,7 @@ namespace
{ {
size_t length = strlength(name); size_t length = strlength(name);
// we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters // $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters
void* memory = global_allocate(sizeof(T) + length * sizeof(char_t)); void* memory = global_allocate(sizeof(T) + length * sizeof(char_t));
if (!memory) return 0; if (!memory) return 0;
@ -5409,7 +5414,6 @@ namespace
return new_xpath_variable<xpath_variable_boolean>(name); return new_xpath_variable<xpath_variable_boolean>(name);
default: default:
assert(false);
return 0; return 0;
} }
} }