X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch;h=14275b3d7eaad78e81a2366f8bd572ae57c55880;hb=95bd7348fbbdd92e4f52b10c1c670b2406aec9d7;hp=72faa1f0c90c89c66a9230fb8e8b53e9eee0fd59;hpb=70f8787d9a6faa68bee6b810a53198c50a9ad760;p=packages%2Frpm.git

diff --git a/rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch b/rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
index 72faa1f..14275b3 100644
--- a/rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
+++ b/rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
@@ -19,13 +19,17 @@
  
      /* Extract dependencies only from files with executable bit set. */
      {	struct stat sb, * st = &sb;
-@@ -904,16 +914,10 @@ static int rpmfcSCRIPT(rpmfc fc)
+@@ -904,20 +914,10 @@ static int rpmfcSCRIPT(rpmfc fc)
      (void) fclose(fp);
  
      if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
 -    	defaultdocdir = rpmExpand("%{?_defaultdocdir}", NULL);
--    	if (defaultdocdir == NULL || *defaultdocdir == '\0') 
--            defaultdocdir = strdup("/usr/share/doc");
+-	/* XXX coverity #1035723 */
+-	/* XXX coverity #1035883 */
+-    	if (defaultdocdir == NULL || *defaultdocdir == '\0')  {
+-            defaultdocdir = _free(defaultdocdir);
+-            defaultdocdir = xstrdup("/usr/share/doc");
+-	}
 -
 -	if (strncmp(fn, defaultdocdir, strlen(defaultdocdir))) {
 -	    if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)