ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Bufferize dependency parsing

pull/36/head
Baptiste Daroussin 2012-08-14 17:01:18 +02:00
parent 38abe86a17
commit 28396110aa
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dependency.c
View File

@ -105,10 +105,12 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
pkg_dependency_t *deplist = NULL; pkg_dependency_t *deplist = NULL;
pkg_comparator_t compare = PKG_ANY; pkg_comparator_t compare = PKG_ANY;
char buf[PKG_BUFSIZE]; char buf[PKG_BUFSIZE];
char package[PKG_BUFSIZE];
char version[PKG_BUFSIZE];
char *start = buf; char *start = buf;
char *ptr = buf; char *ptr = buf;
char *vstart = NULL; char *vstart = NULL;
char *package = NULL, *version = NULL; /* char *package = NULL, *version = NULL;*/
strlcpy(buf, depends, sizeof buf); strlcpy(buf, depends, sizeof buf);
strlcat(buf, " ", sizeof buf); strlcat(buf, " ", sizeof buf);
@ -155,7 +157,8 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
while (PKG_MODULE_SEPARATOR(*iter)) while (PKG_MODULE_SEPARATOR(*iter))
iter++; iter++;
package = strndup(iter, ptr - iter); strlcpy(package, iter, sizeof package);
package[ptr - iter] = '\0';
#if DEBUG_PARSE #if DEBUG_PARSE
fprintf(error_msgout, "Found package: %s\n", package); fprintf(error_msgout, "Found package: %s\n", package);
#endif #endif
@ -169,18 +172,6 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
if (deplist_head == NULL) if (deplist_head == NULL)
deplist_head = deplist; deplist_head = deplist;
if (package != NULL)
{
free(package);
package = NULL;
}
if (version != NULL)
{
free(version);
version = NULL;
}
compare = PKG_ANY; compare = PKG_ANY;
} }
@ -247,7 +238,8 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
case INSIDE_VERSION: case INSIDE_VERSION:
if (PKG_MODULE_SEPARATOR(*ptr) || *(ptr + 1) == '\0') if (PKG_MODULE_SEPARATOR(*ptr) || *(ptr + 1) == '\0')
{ {
version = strndup(vstart, (ptr - vstart)); strlcpy(version, vstart, sizeof version);
version[ptr - vstart] = '\0';
state = OUTSIDE_MODULE; state = OUTSIDE_MODULE;
#if DEBUG_PARSE #if DEBUG_PARSE
@ -258,18 +250,6 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
if (deplist_head == NULL) if (deplist_head == NULL)
deplist_head = deplist; deplist_head = deplist;
if (package != NULL)
{
free(package);
package = NULL;
}
if (version != NULL)
{
free(version);
version = NULL;
}
compare = PKG_ANY; compare = PKG_ANY;
} }