components/openscap/patches/icache.c.patch
branchs11u3-sru
changeset 5494 4d99913076de
equal deleted inserted replaced
5487:386db44fba42 5494:4d99913076de
       
     1 This fix addresses an issue in openscap which is meant
       
     2 to handle systems with small memory configurations. But
       
     3 on solaris we are not choosing to limit the applications
       
     4 memory usage. This has not been contributed upstream,
       
     5 but is intended to by 2016-Mar-15.
       
     6 --- openscap-1.2.3/src/OVAL/probes/probe/icache.c.~1~	2013-03-21 08:27:20.000000000 -0700
       
     7 +++ openscap-1.2.3/src/OVAL/probes/probe/icache.c	2015-11-06 14:06:01.150096481 -0800
       
     8 @@ -506,7 +506,8 @@
       
     9  	cobj_itemcnt = SEXP_list_length(cobj_content);
       
    10  	SEXP_free(cobj_content);
       
    11  
       
    12 -	if (probe_cobj_memcheck(cobj_itemcnt) != 0) {
       
    13 +#if !defined (__sun)  && !defined  (__SVR4)
       
    14 +	if (probe_cobj_memcheck(cobj_itemcnt) != 0) { 
       
    15  
       
    16  		/*
       
    17  		 * Don't set the message again if the collected object is
       
    18 @@ -532,6 +533,7 @@
       
    19  
       
    20  		return 2;
       
    21  	}
       
    22 +#endif
       
    23  
       
    24          if (ctx->filters != NULL && probe_item_filtered(item, ctx->filters)) {
       
    25                  SEXP_free(item);