From mboxrd@z Thu Jan 1 00:00:00 1970 From: rennes@openmailbox.org Subject: Re: [PATCH] gnu: Add fontconfig-path-max. Date: Tue, 12 Jul 2016 09:08:14 -0500 Message-ID: <328a872d39b4913fa06c623e24838363@openmailbox.org> References: <7b313a7566d04932f94fb33e7a63c222@openmailbox.org> <877fd1hkzn.fsf@gnu.org> <811ca2f8679999e2777cb5e559e69c37@openmailbox.org> <87furozcvo.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_9499b24743de9689697e90718bc71ce2" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMyMQ-0002IF-Sm for guix-devel@gnu.org; Tue, 12 Jul 2016 10:08:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMyMM-0005L1-P2 for guix-devel@gnu.org; Tue, 12 Jul 2016 10:08:30 -0400 In-Reply-To: <87furozcvo.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: ludo@gnu.org Cc: guix-devel@gnu.org --=_9499b24743de9689697e90718bc71ce2 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hello, > Please see > > regarding commit logs. :-) Reviewed and corrected in the patch. >> +--- a/src/fcstat.c >> ++++ b/src/fcstat.c >> +@@ -278,7 +278,8 @@ FcDirChecksum (const FcChar8 *dir, time_t >> *checksum) >> + { >> + #endif >> + struct stat statb; >> +- char f[PATH_MAX + 1]; >> ++ int size = 128; >> ++ char *f = malloc (size); > > This is not OK, in part because it introduces a memory leak. The fix > should be along the same lines as the rest of the patch. As you suggested, I used the same logic to make this part of patch. > Could you check whether Debian has a patch for a more recent version of > Fontconfig? The version (2.11.0-6.3) is the last version, and not contain a patch for fcstat.c file. It is possible that the Debian team has not had problems with this file to compile. There is a Workaround that suggests mailing lists freedesktop. https://lists.freedesktop.org/archives/dri-devel/2016-April/105704.html Thanks for the comments. --=_9499b24743de9689697e90718bc71ce2 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-gnu-Add-fontconfig.patch Content-Disposition: attachment; filename=0001-gnu-Add-fontconfig.patch; size=5113 RnJvbSBhMjAyNGE1NWM4ZmYwYTc1NWI5ZmNhMDZiMzViMGQzMzdjZTJlNTc3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSZW5lIFNhYXZlZHJhIDxyZW5uZXNAb3Blbm1haWxib3gub3Jn PgpEYXRlOiBUdWUsIDEyIEp1bCAyMDE2IDA4OjAyOjAzIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0g Z251OiBBZGQgZm9udGNvbmZpZy4KCgkqIGdudS9wYWNrYWdlcy9mb250dXRpbHMuc2NtIChmb250 Y29uZmlnKTogVXBkYXRlIHRvIDIuMTIuMC4KCSogZ251L3BhY2thZ2VzL3BhdGNoZXMvZm9udGNv bmZpZy1wYXRoLW1heC5wYXRjaDogTmV3IGZpbGUuCgkqIGdudS9sb2NhbC5tayAoZGlzdF9wYXRj aF9EQVRBKTogQWRkIGl0LgotLS0KIGdudS9sb2NhbC5tayAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDIgKwogZ251L3BhY2thZ2VzL2ZvbnR1dGlscy5zY20gICAgICAgICAg ICAgICAgICAgICB8ICAgOSArKy0KIGdudS9wYWNrYWdlcy9wYXRjaGVzL2ZvbnRjb25maWctcGF0 aC1tYXgucGF0Y2ggfCAxMDAgKysrKysrKysrKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFu Z2VkLCAxMDkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0 NCBnbnUvcGFja2FnZXMvcGF0Y2hlcy9mb250Y29uZmlnLXBhdGgtbWF4LnBhdGNoCgpkaWZmIC0t Z2l0IGEvZ251L2xvY2FsLm1rIGIvZ251L2xvY2FsLm1rCmluZGV4IDIyMzg1MDYuLmJkZDhlNzgg MTAwNjQ0Ci0tLSBhL2dudS9sb2NhbC5taworKysgYi9nbnUvbG9jYWwubWsKQEAgLTUsNiArNSw3 IEBACiAjIENvcHlyaWdodCDCqSAyMDEzLCAyMDE0LCAyMDE1LCAyMDE2IE1hcmsgSCBXZWF2ZXIg PG1od0BuZXRyaXMub3JnPgogIyBDb3B5cmlnaHQgwqkgMjAxNiBDaHJpcyBNYXJ1c2ljaCA8Y21t YXJ1c2ljaEBnbWFpbC5jb20+CiAjIENvcHlyaWdodCDCqSAyMDE2IEtlaSBZYW1hc2hpdGEgPGtl aUBvcGVubWFpbGJveC5vcmc+CisjIENvcHlyaWdodCDCqSAyMDE2IFJlbmUgU2FhdmVkcmEgPHJl bm5lc0BvcGVubWFpbGJveC5vcmc+CiAjCiAjIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4 LgogIwpAQCAtNDc4LDYgKzQ3OSw3IEBAIGRpc3RfcGF0Y2hfREFUQSA9CQkJCQkJXAogICBnbnUv cGFja2FnZXMvcGF0Y2hlcy9mbGludC1sZGNvbmZpZy5wYXRjaAkJCVwKICAgZ251L3BhY2thZ2Vz L3BhdGNoZXMvZmx0ay1zaGFyZWQtbGliLWRlZmluZXMucGF0Y2gJCVwKICAgZ251L3BhY2thZ2Vz L3BhdGNoZXMvZmx0ay14Zm9udC1vbi1kZW1hbmQucGF0Y2gJCVwKKyAgZ251L3BhY2thZ2VzL3Bh dGNoZXMvZm9udGNvbmZpZy1wYXRoLW1heC5wYXRjaAkJXAogICBnbnUvcGFja2FnZXMvcGF0Y2hl cy9mb250Zm9yZ2Utc3ZnLW1vZHRpbWUucGF0Y2gJCVwKICAgZ251L3BhY2thZ2VzL3BhdGNoZXMv ZnJlZWltYWdlLUNWRS0yMDE1LTA4NTIucGF0Y2gJCVwKICAgZ251L3BhY2thZ2VzL3BhdGNoZXMv Z2F3ay1mdHMtdGVzdC5wYXRjaAkJCVwKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9mb250dXRp bHMuc2NtIGIvZ251L3BhY2thZ2VzL2ZvbnR1dGlscy5zY20KaW5kZXggNWY2ZmYxNS4uYzcwNmUz ZSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2ZvbnR1dGlscy5zY20KKysrIGIvZ251L3BhY2th Z2VzL2ZvbnR1dGlscy5zY20KQEAgLTMsNiArMyw3IEBACiA7OzsgQ29weXJpZ2h0IMKpIDIwMTQs IDIwMTYgRXJpYyBCYXZpZXIgPGJhdmllckBtZW1iZXIuZnNmLm9yZz4KIDs7OyBDb3B5cmlnaHQg wqkgMjAxNiBNYXJrIEggV2VhdmVyIDxtaHdAbmV0cmlzLm9yZz4KIDs7OyBDb3B5cmlnaHQgwqkg MjAxNiBFZnJhaW0gRmxhc2huZXIgPGVmcmFpbUBmbGFzaG5lci5jby5pbD4KKzs7OyBDb3B5cmln aHQgwqkgMjAxNiBSZW5lIFNhYXZlZHJhIDxyZW5uZXNAb3Blbm1haWxib3gub3JnPgogOzs7CiA7 OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTIyNSwxNCArMjI2LDE4 IEBAIGZvbnRzIHRvL2Zyb20gdGhlIFdPRkYyIGZvcm1hdC4iKQogKGRlZmluZS1wdWJsaWMgZm9u dGNvbmZpZwogICAocGFja2FnZQogICAgKG5hbWUgImZvbnRjb25maWciKQotICAgKHZlcnNpb24g IjIuMTEuOTQiKQorICAgKHZlcnNpb24gIjIuMTIuMCIpCiAgICAoc291cmNlIChvcmlnaW4KICAg ICAgICAgICAgIChtZXRob2QgdXJsLWZldGNoKQogICAgICAgICAgICAgKHVyaSAoc3RyaW5nLWFw cGVuZAogICAgICAgICAgICAgICAgICAgICJodHRwczovL3d3dy5mcmVlZGVza3RvcC5vcmcvc29m dHdhcmUvZm9udGNvbmZpZy9yZWxlYXNlL2ZvbnRjb25maWctIgogICAgICAgICAgICAgICAgICAg IHZlcnNpb24gIi50YXIuYnoyIikpCiAgICAgICAgICAgICAoc2hhMjU2IChiYXNlMzIKLSAgICAg ICAgICAgICAgICAgICAgICIxcHNybDRiNGdpNHdtYnZ3d2g0M2xrNDkxd3NsOGxndnFqMTQ2cHJs Y2hhM3Z3amMwcXlwIikpKSkKKyAgICAgICAgICAgICAgICAgICAgICIwOTQyZ2wwbjl6aDNsd2hh MWJmdnpxN21oN3B6eWNmeXM4ZjJtYmNnc3Mwenp6cHk4Y3hsIikpCisgICAgICAgICAgICA7OyBU aGUgcGF0Y2ggb3JpZ2luYXRlcyBmcm9tIHRoZSBEZWJpYW4gcHJvamVjdCwKKyAgICAgICAgICAg IDs7IHNlZSBodHRwczovL3d3dy5kZWJpYW4ub3JnLworICAgICAgICAgICAgKHBhdGNoZXMgKHNl YXJjaC1wYXRjaGVzCisgICAgICAgICAgICAgICAgICAgICAgImZvbnRjb25maWctcGF0aC1tYXgu cGF0Y2giKSkpKQogICAgKGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQogICAgKHByb3Bh Z2F0ZWQtaW5wdXRzIGAoKCJleHBhdCIgLGV4cGF0KQogICAgICAgICAgICAgICAgICAgICAgICAg KCJmcmVldHlwZSIgLGZyZWV0eXBlKSkpCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcGF0Y2hl cy9mb250Y29uZmlnLXBhdGgtbWF4LnBhdGNoIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvZm9udGNv bmZpZy1wYXRoLW1heC5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4x Y2VlYTEyCi0tLSAvZGV2L251bGwKKysrIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvZm9udGNvbmZp Zy1wYXRoLW1heC5wYXRjaApAQCAtMCwwICsxLDEwMCBAQAorVGhlIHBhdGNoIHJlcGxhY2VzIHRo ZSB1c2Ugb2YgbWFjcm8gUEFUSF9NQVgsIGluIGRlZmF1bHQuYyBhbmQKK2Zjc3RhdC5jIGZpbGVz LgorLS0tCisgc3JjL2ZjZGVmYXVsdC5jIHwgMzIgKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0KKyBzcmMvZmNzdGF0LmMgICAgfCAyOCArKysrKysrKysrKysrKysrKysrKysrKy0tLS0t CisgMiBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKKwor ZGlmZiAtLWdpdCBhL3NyYy9mY2RlZmF1bHQuYyBiL3NyYy9mY2RlZmF1bHQuYworaW5kZXggNjY0 N2E4Zi4uNDg1Njc3NyAxMDA2NDQKKy0tLSBhL3NyYy9mY2RlZmF1bHQuYworKysrIGIvc3JjL2Zj ZGVmYXVsdC5jCitAQCAtMTUwLDE1ICsxNTAsMzMgQEAgcmV0cnk6CisgIyBpZiBkZWZpbmVkIChI QVZFX0dFVEVYRUNOQU1FKQorIAljb25zdCBjaGFyICpwID0gZ2V0ZXhlY25hbWUgKCk7CisgIyBl bGlmIGRlZmluZWQgKEhBVkVfUkVBRExJTkspCistCWNoYXIgYnVmW1BBVEhfTUFYICsgMV07Cist CWludCBsZW47CisrCWludCBzaXplID0gMTI4OworIAljaGFyICpwID0gTlVMTDsKKyAKKy0JbGVu ID0gcmVhZGxpbmsgKCIvcHJvYy9zZWxmL2V4ZSIsIGJ1Ziwgc2l6ZW9mIChidWYpIC0gMSk7Cist CWlmIChsZW4gIT0gLTEpCistCXsKKy0JICAgIGJ1ZltsZW5dID0gJ1wwJzsKKy0JICAgIHAgPSBi dWY7CisrCXdoaWxlICgxKSB7CisrCSAgICBjaGFyICpidWYgPSBtYWxsb2MgKHNpemUpOworKwkg ICAgaW50IGxlbjsKKysKKysJICAgIGlmIChidWYgPT0gTlVMTCkKKysJCWJyZWFrOworKworKwkg ICAgbGVuID0gcmVhZGxpbmsgKCIvcHJvYy9zZWxmL2V4ZSIsIGJ1Ziwgc2l6ZSAtIDEpOworKwor KwkgICAgaWYgKGxlbiA8IDApCisrCSAgICB7CisrCQlmcmVlKGJ1Zik7CisrCQlicmVhazsKKysJ ICAgIH0KKysKKysJICAgIGlmIChsZW4gPCBzaXplIC0gMSkKKysJICAgIHsKKysJCWJ1ZltsZW5d ID0gJ1wwJzsKKysJCXAgPSBidWY7CisrCQlicmVhazsKKysJICAgIH0KKysKKysJICAgIGZyZWUg KGJ1Zik7CisrCSAgICBzaXplICo9IDI7CisgCX0KKyAjIGVsc2UKKyAJY2hhciAqcCA9IE5VTEw7 CitkaWZmIC0tZ2l0IGEvc3JjL2Zjc3RhdC5jIGIvc3JjL2Zjc3RhdC5jCitpbmRleCAxNzM0ZmE0 Li5iMmE1ZGRiIDEwMDY0NAorLS0tIGEvc3JjL2Zjc3RhdC5jCisrKysgYi9zcmMvZmNzdGF0LmMK K0BAIC0yNzgsMTcgKzI3OCwzNSBAQCBGY0RpckNoZWNrc3VtIChjb25zdCBGY0NoYXI4ICpkaXIs IHRpbWVfdCAqY2hlY2tzdW0pCisgCXsKKyAjZW5kaWYKKyAJc3RydWN0IHN0YXQgc3RhdGI7Cist CWNoYXIgZltQQVRIX01BWCArIDFdOworKwlpbnQgc2l6ZSA9IDEyODsKKysJY2hhciAqZiA9IG1h bGxvYyAoc2l6ZSk7CisgCistCW1lbWNweSAoZiwgZGlyLCBsZW4pOworLQlmW2xlbl0gPSBGQ19E SVJfU0VQQVJBVE9SOworLQltZW1jcHkgKCZmW2xlbiArIDFdLCBmaWxlc1tuXS0+ZF9uYW1lLCBk bGVuKTsKKy0JZltsZW4gKyAxICsgZGxlbl0gPSAwOworKwlpZiAoZiA9PSBOVUxMKQorKwkgICAg YnJlYWs7CisrCisrCWlmIChsZW4gPCAwKQorKwl7CisrCSAgICBmcmVlKGYpOworKwkgICAgYnJl YWs7CisrCX0KKysJCisrCWlmIChsZW4gPCBzaXplIC0gMSkKKysJeworKwkgICAgbWVtY3B5IChm LCBkaXIsIGxlbik7CisrCSAgICBmW2xlbl0gPSBGQ19ESVJfU0VQQVJBVE9SOworKwkgICAgbWVt Y3B5ICgmZltsZW4gKyAxXSwgZmlsZXNbbl0tPmRfbmFtZSwgZGxlbik7CisrCSAgICBmW2xlbiAr IDEgKyBkbGVuXSA9IDA7CisrCX0KKysJCisgCWlmIChsc3RhdCAoZiwgJnN0YXRiKSA8IDApCisg CXsKKyAJICAgIHJldCA9IC0xOworIAkgICAgZ290byBiYWlsOworIAl9CisrCisrCWZyZWUgKGYp OworKwlzaXplICo9IDI7CisrCisgCWlmIChTX0lTRElSIChzdGF0Yi5zdF9tb2RlKSkKKyAJICAg IGdvdG8gYmFpbDsKKyAKKy0tIAorMi42LjMKKwotLSAKMi42LjMKCg== --=_9499b24743de9689697e90718bc71ce2--