emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-query: check regcomp() return value.

Browse Source
This commit is contained in:
Juan RP 2014-06-03 12:50:34 +02:00
parent 776865b548
commit a3c253d03c
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/xbps-query/ownedby.c
View File

@ -73,7 +73,8 @@ match_files_by_pattern(xbps_dictionary_t pkg_filesd,
if (filestr == NULL) if (filestr == NULL)
continue; continue;
if (ffd->regex) { if (ffd->regex) {
regcomp(&regex, ffd->pat, REG_EXTENDED|REG_NOSUB); if (regcomp(&regex, ffd->pat, REG_EXTENDED|REG_NOSUB) != 0)
return;
if (regexec(&regex, filestr, 0, 0, 0) == 0) { if (regexec(&regex, filestr, 0, 0, 0) == 0) {
printf("%s: %s (%s)\n", pkgver, filestr, typestr); printf("%s: %s (%s)\n", pkgver, filestr, typestr);
} }
@ -131,7 +132,8 @@ repo_match_cb(struct xbps_handle *xhp _unused,
for (unsigned int i = 0; i < xbps_array_count(obj); i++) { for (unsigned int i = 0; i < xbps_array_count(obj); i++) {
xbps_array_get_cstring_nocopy(obj, i, &filestr); xbps_array_get_cstring_nocopy(obj, i, &filestr);
if (ffd->regex) { if (ffd->regex) {
regcomp(&regex, ffd->pat, REG_EXTENDED|REG_NOSUB); if (regcomp(&regex, ffd->pat, REG_EXTENDED|REG_NOSUB) != 0)
return errno;
if (regexec(&regex, filestr, 0, 0, 0) == 0) { if (regexec(&regex, filestr, 0, 0, 0) == 0) {
printf("%s: %s (%s)\n", key, filestr, ffd->repouri); printf("%s: %s (%s)\n", key, filestr, ffd->repouri);
} }

10
bin/xbps-query/search.c
View File

@ -116,7 +116,9 @@ search_array_cb(struct xbps_handle *xhp _unused,
vpkgfound = true; vpkgfound = true;
if (sd->regex) { if (sd->regex) {
regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB); if (regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB) != 0)
return errno;
if ((regexec(&regex, pkgver, 0, 0, 0) == 0) || if ((regexec(&regex, pkgver, 0, 0, 0) == 0) ||
(regexec(&regex, desc, 0, 0, 0) == 0)) { (regexec(&regex, desc, 0, 0, 0) == 0)) {
xbps_array_add_cstring_nocopy(sd->results, pkgver); xbps_array_add_cstring_nocopy(sd->results, pkgver);
@ -140,7 +142,8 @@ search_array_cb(struct xbps_handle *xhp _unused,
for (unsigned int i = 0; i < xbps_array_count(obj2); i++) { for (unsigned int i = 0; i < xbps_array_count(obj2); i++) {
xbps_array_get_cstring_nocopy(obj2, i, &str); xbps_array_get_cstring_nocopy(obj2, i, &str);
if (sd->regex) { if (sd->regex) {
regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB); if (regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB) != 0)
return errno;
if (regexec(&regex, str, 0, 0, 0) == 0) { if (regexec(&regex, str, 0, 0, 0) == 0) {
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver); xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
printf("%s: %s (%s)\n", pkgver, str, sd->repourl); printf("%s: %s (%s)\n", pkgver, str, sd->repourl);
@ -162,7 +165,8 @@ search_array_cb(struct xbps_handle *xhp _unused,
/* property is a string */ /* property is a string */
str = xbps_string_cstring_nocopy(obj2); str = xbps_string_cstring_nocopy(obj2);
if (sd->regex) { if (sd->regex) {
regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB); if (regcomp(&regex, sd->pat, REG_EXTENDED|REG_NOSUB) != 0)
return errno;
if (regexec(&regex, str, 0, 0, 0) == 0) { if (regexec(&regex, str, 0, 0, 0) == 0) {
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver); xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
printf("%s: %s (%s)\n", pkgver, str, sd->repourl); printf("%s: %s (%s)\n", pkgver, str, sd->repourl);