--- a/components/openscap/patches/oval_variable_fix.patch Thu May 21 15:02:14 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-This patch fixes the issue when variables are used in XCCDF
-and the selector value is outside the specified list of values
-for the variable, prevents oscap from dumping core.
-This patch does not need to be contributed upstream, as it is
-from the upstream community.
-This patch is based on https://github.com/OpenSCAP/openscap/commit/dd94c23cfafbd1ad0d316ccf4fa9489af4c68c74
-This patch will not be needed once we upgrade to 1.2.2 or higher.
---- openscap-1.2.1/src/XCCDF_POLICY/xccdf_policy.c.~1~ 2015-03-13 10:26:12.158240726 -0700
-+++ openscap-1.2.1/src/XCCDF_POLICY/xccdf_policy.c 2015-03-13 10:28:36.287476734 -0700
-@@ -2166,7 +2166,13 @@
- }
-
- struct xccdf_value_instance *instance = xccdf_value_get_instance_by_selector((struct xccdf_value *) item, selector);
-- return xccdf_value_instance_get_value(instance);
-+ if (instance == NULL) {
-+ oscap_seterr(OSCAP_EFAMILY_XCCDF, "Invalid selector '%s' for xccdf:value/@id='%s'. Using null value instead.",
-+ selector, xccdf_value_get_id((struct xccdf_value *) item));
-+ return NULL;
-+ } else {
-+ return xccdf_value_instance_get_value(instance);
-+ }
- }
-
- static int xccdf_policy_get_refine_value_oper(struct xccdf_policy * policy, struct xccdf_item * item)