From ff16d1a487cd10923e85cd75537617ecb14fa379 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 28 May 2012 12:14:15 +0300 Subject: [PATCH] Handle rpmfiNew() failure centrally in genCpioListAndHeader() --- build/files.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build/files.c b/build/files.c index 9313da8..ab4d6ea 100644 --- a/build/files.c +++ b/build/files.c @@ -1198,8 +1198,10 @@ static void genCpioListAndHeader(FileList fl, headerConvert(h, HEADERCONV_COMPRESSFILELIST); fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, flags); - if (fi == NULL) + if (fi == NULL) { + fl->processingFailed = 1; return; + } /* * Grab the real filenames from ORIGFILENAMES and put into OLDFILENAMES, @@ -1903,8 +1905,6 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, "PartialHardlinkSets", "4.0.4-1"); genCpioListAndHeader(&fl, &pkg->cpioList, pkg->header, 0); - if (pkg->cpioList == NULL) - fl.processingFailed = 1; exit: FileListFree(&fl); @@ -2031,9 +2031,6 @@ rpmRC processSourceFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags) if (spec->sourceHeader != NULL) { genCpioListAndHeader(&fl, &spec->sourceCpioList, spec->sourceHeader, 1); - if (spec->sourceCpioList == NULL) { - fl.processingFailed = 1; - } } } -- 2.7.4