mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2024-12-22 18:41:52 +00:00
Code Releases Activity

Use emalloc/estrdup/efree in v8js_commonjs.cc + fix memory leak

Browse Source
This commit is contained in:
Stefan Siegl 2015-08-01 19:07:45 +02:00
parent 2ce7e420a7
commit bfc6b29989
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
v8js_commonjs.cc
View File

@ -24,7 +24,7 @@ extern "C" {
static void v8js_commonjs_split_terms(char *identifier, std::vector<char *> &terms) static void v8js_commonjs_split_terms(char *identifier, std::vector<char *> &terms)
{ {
char *term = (char *)malloc(PATH_MAX), *ptr = term; char *term = (char *) emalloc(PATH_MAX), *ptr = term;
// Initialise the term string // Initialise the term string
*term = 0; *term = 0;
@ -34,7 +34,7 @@ static void v8js_commonjs_split_terms(char *identifier, std::vector<char *> &ter
if (strlen(term) > 0) { if (strlen(term) > 0) {
// Terminate term string and add to terms vector // Terminate term string and add to terms vector
*ptr++ = 0; *ptr++ = 0;
terms.push_back(strdup(term)); terms.push_back(estrdup(term));
// Reset term string // Reset term string
memset(term, 0, strlen(term)); memset(term, 0, strlen(term));
@ -50,12 +50,10 @@ static void v8js_commonjs_split_terms(char *identifier, std::vector<char *> &ter
if (strlen(term) > 0) { if (strlen(term) > 0) {
// Terminate term string and add to terms vector // Terminate term string and add to terms vector
*ptr++ = 0; *ptr++ = 0;
terms.push_back(strdup(term)); terms.push_back(estrdup(term));
} }
if (term > 0) { efree(term);
free(term);
}
} }
void v8js_commonjs_normalise_identifier(char *base, char *identifier, char *normalised_path, char *module_name) void v8js_commonjs_normalise_identifier(char *base, char *identifier, char *normalised_path, char *module_name)
@ -92,6 +90,8 @@ void v8js_commonjs_normalise_identifier(char *base, char *identifier, char *norm
*module_name = 0; *module_name = 0;
strcat(module_name, normalised_terms.back()); strcat(module_name, normalised_terms.back());
efree(normalised_terms.back());
normalised_terms.pop_back(); normalised_terms.pop_back();
for (std::vector<char *>::iterator it = normalised_terms.begin(); it != normalised_terms.end(); it++) { for (std::vector<char *>::iterator it = normalised_terms.begin(); it != normalised_terms.end(); it++) {