From 14342674191ca11c4455ff7ac9b76b05173eb575 Mon Sep 17 00:00:00 2001 From: Stephen Smalley Date: Mon, 2 Feb 2015 17:11:45 -0500 Subject: [PATCH] libselinux: pcre_study can return NULL without error. Per the man page, pcre_study can return NULL without error if it could not find any additional information. Errors are indicated by the combination of a NULL return value and a non-NULL error string. Fix the handling so that we do not incorrectly reject file_contexts entries. Change-Id: I2e7b7e01d85d96dd7fe78545d3ee3834281c4eba Signed-off-by: Stephen Smalley --- libselinux/src/label_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c index 8e7b2889..71b085ae 100644 --- a/libselinux/src/label_file.c +++ b/libselinux/src/label_file.c @@ -138,7 +138,7 @@ static int compile_regex(struct saved_data *data, struct spec *spec, const char } spec->sd = pcre_study(spec->regex, 0, &tmperrbuf); - if (!spec->sd) { + if (!spec->sd && tmperrbuf) { if (errbuf) *errbuf=tmperrbuf; return -1;