mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/match.c: Emit a debug message if pcre2_match returns an unexpected error

Browse Source 
When iterating on commit 3c1554e7f2 ("lib: Add new app2_class field
for classifying applications") in early versions I was accidentally
passing NULL to match().  Unexpectedly this returned 1 (ie. matching).
This happened because we did not correctly handle other errors apart
from PCRE2_ERROR_NOMATCH from pcre2_match.

Emit a debug message when this happens, and return no match.

To test this I ran these commands, and there was no output:

  $ make && LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 make check
  $ find -name '*.log' | xargs grep 'match.*unexpected error'
This commit is contained in:
Richard W.M. Jones
2025-11-05 13:28:22 +00:00
committed by rwmjones
parent 07079ea6fc
commit 28bc6ca6b9
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/match.c
View File

@@ -30,6 +30,16 @@
#include "guestfs.h"
#include "guestfs-internal.h"
/* We don't expected these matching functions to return errors, except
* for PCRE2_ERROR_NOMATCH. If it happens it's an internal error, but
* emit a debug message rather than crashing.
*/
static void
unexpected_match_error (guestfs_h *g, const char *fn, int r)
{
debug (g, "%s: unexpected error: %d", fn, r);
}
/* Match a regular expression which contains no captures. Returns
* true if it matches or false if it doesn't.
*/
@@ -44,6 +54,10 @@ guestfs_int_match (guestfs_h *g, const char *str, const pcre2_code *re)
0, 0, match_data, NULL);
if (r == PCRE2_ERROR_NOMATCH)
return 0;
if (r < 0) {
unexpected_match_error (g, __func__, r);
return 0;
}
return 1;
}
@@ -64,6 +78,10 @@ guestfs_int_match1 (guestfs_h *g, const char *str, const pcre2_code *re)
0, 0, match_data, NULL);
if (r == PCRE2_ERROR_NOMATCH)
return NULL;
if (r < 0) {
unexpected_match_error (g, __func__, r);
return 0;
}
vec = pcre2_get_ovector_pointer (match_data);
@@ -84,6 +102,10 @@ guestfs_int_match2 (guestfs_h *g, const char *str, const pcre2_code *re,
0, 0, match_data, NULL);
if (r == PCRE2_ERROR_NOMATCH)
return 0;
if (r < 0) {
unexpected_match_error (g, __func__, r);
return 0;
}
vec = pcre2_get_ovector_pointer (match_data);
@@ -110,6 +132,10 @@ guestfs_int_match3 (guestfs_h *g, const char *str, const pcre2_code *re,
0, 0, match_data, NULL);
if (r == PCRE2_ERROR_NOMATCH)
return 0;
if (r < 0) {
unexpected_match_error (g, __func__, r);
return 0;
}
vec = pcre2_get_ovector_pointer (match_data);
@@ -138,6 +164,10 @@ guestfs_int_match4 (guestfs_h *g, const char *str, const pcre2_code *re,
0, 0, match_data, NULL);
if (r == PCRE2_ERROR_NOMATCH)
return 0;
if (r < 0) {
unexpected_match_error (g, __func__, r);
return 0;
}
vec = pcre2_get_ovector_pointer (match_data);
@@ -169,6 +199,10 @@ guestfs_int_match6 (guestfs_h *g, const char *str, const pcre2_code *re,
0, 0, match_data, NULL);
if (r == PCRE2_ERROR_NOMATCH)
return 0;
if (r < 0) {
unexpected_match_error (g, __func__, r);
return 0;
}
vec = pcre2_get_ovector_pointer (match_data);