From: pcarana <pc.moreno2099@gmail.com>
Date: Tue, 29 Sep 2020 15:19:00 +0000 (-0500)
Subject: Merge from master (v1.4.1)
X-Git-Tag: v1.4.2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3ce3cbea4633a36844e8500f52a525b06c6c95a;p=thirdparty%2FFORT-validator.git

Merge from master (v1.4.1)
---

a3ce3cbea4633a36844e8500f52a525b06c6c95a
diff --cc src/rsync/rsync.c
index 4ba18183,786e3b32..e986cfdc
--- a/src/rsync/rsync.c
+++ b/src/rsync/rsync.c
@@@ -518,15 -520,9 +518,15 @@@ ancestor_error(char const *error_uri, v
  		return ENSURE_NEGATIVE(error);
  	}
  
 +	/* Ignore non rsync error'd URIs */
 +	if (!uri_is_rsync(req_err_uri)) {
 +		free(req_err_uri);
 +		return 0;
 +	}
 +
  	error = is_descendant(req_err_uri, search) ? EEXIST : 0;
  
- 	free(req_err_uri);
+ 	uri_refput(req_err_uri);
  	return error;
  }