Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: third_party/instrumented_libraries/patches/libfontconfig.trusty.diff

Issue 614903003: Instrumented libraries: introduce release-specific patches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/instrumented_libraries/patches/libfontconfig.trusty.diff
diff --git a/third_party/instrumented_libraries/patches/libfontconfig.diff b/third_party/instrumented_libraries/patches/libfontconfig.trusty.diff
similarity index 50%
rename from third_party/instrumented_libraries/patches/libfontconfig.diff
rename to third_party/instrumented_libraries/patches/libfontconfig.trusty.diff
index 19f85f7ad9df17eca95b9a1c6c9a77a207e3233d..7cfeba5e700f04cd2a0bae5997d083eedaf648bf 100644
--- a/third_party/instrumented_libraries/patches/libfontconfig.diff
+++ b/third_party/instrumented_libraries/patches/libfontconfig.trusty.diff
@@ -1,13 +1,13 @@
-diff -rupN ./src/fcpat.c ../fontconfig-2.8.0-patched/src/fcpat.c
---- ./src/fcpat.c 2009-11-17 01:46:18.000000000 +0300
-+++ ../fontconfig-2.8.0-patched/src/fcpat.c 2014-01-27 20:11:36.185213935 +0400
-@@ -37,6 +37,9 @@ FcPatternCreate (void)
+diff -rupN ./src/fcpat.c ../fontconfig-2.11.0-patched/src/fcpat.c
+--- ./src/fcpat.c 2013-10-11 07:10:18.000000000 +0400
++++ ../fontconfig-2.11.0-patched/src/fcpat.c 2014-09-30 22:14:55.818360071 +0400
+@@ -33,6 +33,9 @@ FcPatternCreate (void)
p = (FcPattern *) malloc (sizeof (FcPattern));
if (!p)
return 0;
+ // Silence Valgrind/MemorySanitizer. There is uninitialized padding at the
+ // end of this structure. When serialized to file, this will cause a report.
+ memset(p, 0, sizeof(*p));
- FcMemAlloc (FC_MEM_PATTERN, sizeof (FcPattern));
p->num = 0;
p->size = 0;
+ p->elts_offset = FcPtrToOffset (p, NULL);

Powered by Google App Engine
This is Rietveld 408576698