- stable sort for policy specifications, patterns before paths.

CVS patchset: 7121
CVS date: 2004/02/22 23:43:05

diff --git a/CHANGES b/CHANGES
index 2c633fd4d76182deaec55a80e314b65f24a9c3f1..f15ade2cf864a85ef1611d3da25673258d9eb2fc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@
        - establish rpm_script_t before scriptlet exec.
        - python: add patch to rpm-4_3 to initialize RE contexts.
        - fix: only first "mkdir -p" directory had context set.
+       - stable sort for policy specifications, patterns before paths.
 
 4.2.1 -> 4.2.2:
        - unify signal handling in librpmio, use condvar to deliver signal.

diff --git a/lib/rpmsx.c b/lib/rpmsx.c
index a61ccaa0da9c5eae42f67b565edf64443a8d9cf0..f45b7f80a8e3af0b9ef8fddbb0ae8837a5f43fb7 100644 (file)
--- a/lib/rpmsx.c
+++ b/lib/rpmsx.c
@@ -16,23 +16,37 @@
 int _rpmsx_debug = 0;
 
 /**
- */
-static int rpmsxpCompare(const void* A, const void* B)
-       /*@*/
-{
-    rpmsxp sxpA = (rpmsxp) A;
-    rpmsxp sxpB = (rpmsxp) B;
-    return (sxpB->hasMetaChars - sxpA->hasMetaChars);
-}
-
-/**
- * Sort the specifications with most general first.
+ * Stable sort for policy specifications, patterns before paths.
  * @param sx           security context patterns
  */
 static void rpmsxSort(rpmsx sx)
        /*@modifies sx @*/
 {
-    qsort(sx->sxp, sx->Count, sizeof(*sx->sxp), rpmsxpCompare);
+    rpmsxp sxp;
+    int i, j;
+
+    /* Stable sort for policy regex's and paths. */
+    sxp = xmalloc(sizeof(*sxp) * sx->Count);
+
+    /* Regex patterns first ... */
+    j = 0;
+    for (i = 0; i < sx->Count; i++) {
+       if (!sx->sxp[i].hasMetaChars)
+           continue;
+       memcpy(sxp + j, sx->sxp + i, sizeof(*sxp));
+       j++;
+    }
+
+    /* ... then file paths. */
+    for (i = 0; i < sx->Count; i++) {
+       if (sx->sxp[i].hasMetaChars)
+           continue;
+       memcpy(sxp + j, sx->sxp + i, sizeof(*sxp));
+       j++;
+    }
+
+    sx->sxp = _free(sx->sxp);
+    sx->sxp = sxp;
 }
 
 /* Determine if the regular expression specification has any meta characters. */
@@ -308,6 +322,7 @@ int rpmsxParse(rpmsx sx, const char * fn)
     int pass;
     int regerr;
     int nerr = 0;
+    
 #define        inc_err()       nerr++
 
 /*@-branchstate@*/
@@ -467,7 +482,7 @@ int rpmsxParse(rpmsx sx, const char * fn)
 /*@=branchstate@*/
     (void) fclose(fp);
 
-    /* Sort the specifications with most general first */
+   /* Stable sort for policy specifications, patterns before paths. */
     rpmsxSort(sx);
 
     /* Verify no exact duplicates */

diff --git a/rpm.spec.in b/rpm.spec.in
index e357a6e18bcc2c1af66a48e62bd0c450af50bd32..6f482f4f892af2dd044d98526812e2cf3d97fd83 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -484,6 +484,7 @@ exit 0
 %changelog
 * Sun Feb 22 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.14
 - add ia32e arch.
+- stable sort for policy specifications, patterns before paths.
 
 * Fri Feb 20 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.13
 - fix: only first "mkdir -p" directory had context set.