From 6063424c82f18f3ea8bbf9a92fd30b349ec778bd Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Tue, 29 Mar 2005 17:18:59 +0000 Subject: Replaced snprintf calls by the SNPRINTF macro to avoid buffer overflows when copying strings --- lib/libalpm/package.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/libalpm/package.c') diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 418fefb1..9ffd49b6 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -131,28 +131,28 @@ static int parse_descfile(char *descfile, pmpkg_t *info, int output) key = _alpm_strtoupper(key); _alpm_strtrim(ptr); if(!strcmp(key, "PKGNAME")) { - strncpy(info->name, ptr, sizeof(info->name)); + STRNCPY(info->name, ptr, sizeof(info->name)); } else if(!strcmp(key, "PKGVER")) { - strncpy(info->version, ptr, sizeof(info->version)); + STRNCPY(info->version, ptr, sizeof(info->version)); } else if(!strcmp(key, "PKGDESC")) { - strncpy(info->desc, ptr, sizeof(info->desc)); + STRNCPY(info->desc, ptr, sizeof(info->desc)); } else if(!strcmp(key, "GROUP")) { info->groups = pm_list_add(info->groups, strdup(ptr)); } else if(!strcmp(key, "URL")) { - strncpy(info->url, ptr, sizeof(info->url)); + STRNCPY(info->url, ptr, sizeof(info->url)); } else if(!strcmp(key, "LICENSE")) { - strncpy(info->license, ptr, sizeof(info->license)); + STRNCPY(info->license, ptr, sizeof(info->license)); } else if(!strcmp(key, "BUILDDATE")) { - strncpy(info->builddate, ptr, sizeof(info->builddate)); + STRNCPY(info->builddate, ptr, sizeof(info->builddate)); } else if(!strcmp(key, "INSTALLDATE")) { - strncpy(info->installdate, ptr, sizeof(info->installdate)); + STRNCPY(info->installdate, ptr, sizeof(info->installdate)); } else if(!strcmp(key, "PACKAGER")) { - strncpy(info->packager, ptr, sizeof(info->packager)); + STRNCPY(info->packager, ptr, sizeof(info->packager)); } else if(!strcmp(key, "ARCH")) { - strncpy(info->arch, ptr, sizeof(info->arch)); + STRNCPY(info->arch, ptr, sizeof(info->arch)); } else if(!strcmp(key, "SIZE")) { char tmp[32]; - strncpy(tmp, ptr, sizeof(tmp)); + STRNCPY(tmp, ptr, sizeof(tmp)); info->size = atol(tmp); } else if(!strcmp(key, "DEPEND")) { info->depends = pm_list_add(info->depends, strdup(ptr)); -- cgit v1.2.3