Don't assume rpmteNew() always succeeds, part II

- Return error from rpmtsAddInstallElement() if rpmteNew() fails. This
  can't currently happen, but handling this error makes it possible
  to do sanity checks on the header contents, such as file list integrity.

diff --git a/lib/depends.c b/lib/depends.c
index 2bebb63..ac735a6 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -338,6 +338,12 @@ int rpmtsAddInstallElement(rpmts ts, Header h,
            goto exit;
     }
 
+    p = rpmteNew(ts, h, TR_ADDED, key, relocs);
+    if (p == NULL) {
+       ec = 1;
+       goto exit;
+    }
+
     /* Check binary packages for redundancies in the set */
     if (!isSource) {
        oc = findPos(ts, tscolor, h, upgrade);
@@ -347,6 +353,7 @@ int rpmtsAddInstallElement(rpmts ts, Header h,
            tsmem->order[oc] = rpmteFree(tsmem->order[oc]);
        /* If newer NEVR was already added, we're done */
        } else if (oc < 0) {
+           p = rpmteFree(p);
            goto exit;
        }
     }
@@ -362,7 +369,6 @@ int rpmtsAddInstallElement(rpmts ts, Header h,
                        tsmem->orderAlloced * sizeof(*tsmem->order));
     }
 
-    p = rpmteNew(ts, h, TR_ADDED, key, relocs);
 
     tsmem->order[oc] = p;
     if (oc == tsmem->orderCount) {