Public/mxml
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/mxml.git synced 2026-09-09 01:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed another memory leak.

Browse Source
This commit is contained in:
Ryu Sawada 2005-10-09 15:40:20 +00:00
parent 4b7bbae2fc
commit ac982aa77f
1 changed files with 81 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
mxml.c
View File

@ -1185,7 +1185,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size)
return read_error(HERE, "Unterminated !DOCTYPE element"); return read_error(HERE, "Unterminated !DOCTYPE element");
j = 0; j = 0;
while (*p && *p != '>' || j > 0) { while (*p && (*p != '>' || j > 0)) {
if (*p == '\n') if (*p == '\n')
line_number++; line_number++;
else if (*p == '<') else if (*p == '<')
@ -1435,6 +1435,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
buffer = (char *) malloc(strlen(*buf) + 1); buffer = (char *) malloc(strlen(*buf) + 1);
if (buffer == NULL) { if (buffer == NULL) {
read_error(HERE, "Cannot allocate memory."); read_error(HERE, "Cannot allocate memory.");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
strcpy(buffer, *buf); strcpy(buffer, *buf);
@ -1457,7 +1460,6 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
return 0; return 0;
} }
free(*buf);
p = pv + 1; p = pv + 1;
/* search !ENTITY */ /* search !ENTITY */
@ -1476,6 +1478,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
} }
if (!*p) { if (!*p) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1484,6 +1489,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
p += 3; p += 3;
if (strstr(p, "-->") == NULL) { if (strstr(p, "-->") == NULL) {
read_error(HERE, "Unterminated comment"); read_error(HERE, "Unterminated comment");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1500,6 +1508,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
nentity++; nentity++;
if (nentity >= MXML_MAX_ENTITY) { if (nentity >= MXML_MAX_ENTITY) {
read_error(HERE, "Too much entities"); read_error(HERE, "Too much entities");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1517,10 +1528,16 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
} }
if (!*p) { if (!*p) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
if (*p == '<' || *p == '>') { if (*p == '<' || *p == '>') {
read_error(HERE, "Unexpected \'%c\' inside !ENTITY", *p); read_error(HERE, "Unexpected \'%c\' inside !ENTITY", *p);
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1530,10 +1547,16 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
if (!*pv) { if (!*pv) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
if (*pv == '<' || *pv == '>') { if (*pv == '<' || *pv == '>') {
read_error(HERE, "Unexpected \'%c\' inside entity \"%s\"", *pv, &entity_name[nentity][1]); read_error(HERE, "Unexpected \'%c\' inside entity \"%s\"", *pv, &entity_name[nentity][1]);
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1549,10 +1572,16 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
if (!*p) { if (!*p) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
if (*p == '<') { if (*p == '<') {
read_error(HERE, "Unexpected \'<\' inside entity \"%s\"", &entity_name[nentity][1]); read_error(HERE, "Unexpected \'<\' inside entity \"%s\"", &entity_name[nentity][1]);
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1564,10 +1593,16 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
} }
if (!*p) { if (!*p) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
if (*p == '>') { if (*p == '>') {
read_error(HERE, "Unexpected \'>\' inside entity \"%s\"", &entity_name[nentity][1]); read_error(HERE, "Unexpected \'>\' inside entity \"%s\"", &entity_name[nentity][1]);
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1587,21 +1622,33 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
} }
if (!*p) { if (!*p) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
if (*p == '>') { if (*p == '>') {
read_error(HERE, "Unexpected \'>\' inside entity \"%s\"", &entity_name[nentity][1]); read_error(HERE, "Unexpected \'>\' inside entity \"%s\"", &entity_name[nentity][1]);
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
if (*p != '\"' && *p != '\'') { if (*p != '\"' && *p != '\'') {
read_error(HERE, "Replacement was not found for entity \"%s\"", &entity_name[nentity][1]); read_error(HERE, "Replacement was not found for entity \"%s\"", &entity_name[nentity][1]);
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
delimiter = *p; delimiter = *p;
p++; p++;
if (!*p) { if (!*p) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
pv = p; pv = p;
@ -1610,10 +1657,16 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
if (!*pv) { if (!*pv) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
if (*pv == '<') { if (*pv == '<') {
read_error(HERE, "Unexpected \'%c\' inside entity \"%s\"", *pv, &entity_name[nentity][1]); read_error(HERE, "Unexpected \'%c\' inside entity \"%s\"", *pv, &entity_name[nentity][1]);
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1621,6 +1674,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
replacement = (char *) malloc(len + 1); replacement = (char *) malloc(len + 1);
if (replacement == NULL) { if (replacement == NULL) {
read_error(HERE, "Cannot allocate memory."); read_error(HERE, "Cannot allocate memory.");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1634,6 +1690,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
entity_value[nentity] = (char *) malloc(strlen(replacement)); entity_value[nentity] = (char *) malloc(strlen(replacement));
if (entity_value[nentity] == NULL) { if (entity_value[nentity] == NULL) {
read_error(HERE, "Cannot allocate memory."); read_error(HERE, "Cannot allocate memory.");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
strcpy(entity_value[nentity], replacement); strcpy(entity_value[nentity], replacement);
@ -1648,6 +1707,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
} }
if (!*p) { if (!*p) {
read_error(HERE, "Unexpected end of file"); read_error(HERE, "Unexpected end of file");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
} }
@ -1673,6 +1735,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
(char *) malloc(strlen(entity_reference_name[i]) + strlen("<!-- is missing -->") + 1); (char *) malloc(strlen(entity_reference_name[i]) + strlen("<!-- is missing -->") + 1);
if (entity_value[i] == NULL) { if (entity_value[i] == NULL) {
read_error(HERE, "Cannot allocate memory."); read_error(HERE, "Cannot allocate memory.");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
sprintf(entity_value[i], "<!-- %s is missing -->", entity_reference_name[i]); sprintf(entity_value[i], "<!-- %s is missing -->", entity_reference_name[i]);
@ -1683,6 +1748,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
entity_value[i] = (char *) malloc(1); entity_value[i] = (char *) malloc(1);
if (entity_value[i] == NULL) { if (entity_value[i] == NULL) {
read_error(HERE, "Cannot allocate memory."); read_error(HERE, "Cannot allocate memory.");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
entity_value[i][0] = 0; entity_value[i][0] = 0;
@ -1690,6 +1758,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
entity_value[i] = (char *) malloc(length); entity_value[i] = (char *) malloc(length);
if (entity_value[i] == NULL) { if (entity_value[i] == NULL) {
read_error(HERE, "Cannot allocate memory."); read_error(HERE, "Cannot allocate memory.");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
@ -1701,6 +1772,9 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
/* recursive parse */ /* recursive parse */
if (mxml_parse_entity(&entity_value[i], filename, error, error_size) != 0) { if (mxml_parse_entity(&entity_value[i], filename, error, error_size) != 0) {
mxml_free_tree(root); mxml_free_tree(root);
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }
} }
@ -1723,10 +1797,14 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size)
} }
} }
/* allocate memory */ /* re-allocate memory */
free(*buf);
*buf = (char *) malloc(length + 1); *buf = (char *) malloc(length + 1);
if (*buf == NULL) { if (*buf == NULL) {
read_error(HERE, "Cannot allocate memory."); read_error(HERE, "Cannot allocate memory.");
free(buffer);
for (ip = 0; ip < MXML_MAX_ENTITY; ip++)
free(entity_value[ip]);
return 1; return 1;
} }