crosswalk-thirdparty: fix uninitialized variable error

Bug-Tizen: BTY-117
Change-Id: Iebe1dcd483d29586f28f70122f7e56d2de2aa764
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty-extraconf.inc b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty-extraconf.inc
index 97e3fcf..d7c018d 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty-extraconf.inc
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty-extraconf.inc
@@ -8,6 +8,10 @@ SRC_URI += "\
             "
 SRC_URI += "file://fix-crosbuild.patch"
 SRC_URI += "file://fix-egl-version.patch"
+SRC_URI += "file://fix-uninitialized-error-glyf.patch"
+SRC_URI += "file://fix-uninitialized-error-woff2.patch"
+SRC_URI += "file://fix-uninitialized-error-name.patch"
+SRC_URI += "file://fix-uninitialized-error-VDMXParser.patch"
 
 # This comes from the chromium recipe:
 # http://layers.openembedded.org/layerindex/recipe/4969/

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-VDMXParser.patch b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-VDMXParser.patch
new file mode 100644 (file)
index 0000000..640dcda
--- /dev/null
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-VDMXParser.patch
@@ -0,0 +1,13 @@
+diff --git a/src/third_party/WebKit/Source/platform/fonts/VDMXParser.cpp b/src/third_party/WebKit/Source/platform/fonts/VDMXParser.cpp
+index 13dc4bf..10be9a2 100644
+--- a/src/third_party/WebKit/Source/platform/fonts/VDMXParser.cpp
++++ b/src/third_party/WebKit/Source/platform/fonts/VDMXParser.cpp
+@@ -125,7 +125,7 @@ bool parseVDMX(int* yMax, int* yMin,
+ 
+     // We ignore the version. Future tables should be backwards compatible with
+     // this layout.
+-    uint16_t numRatios;
++    uint16_t numRatios = 0;
+     if (!buf.skip(4) || !buf.readU16(&numRatios))
+         return false;
+ 

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-glyf.patch b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-glyf.patch
new file mode 100644 (file)
index 0000000..f483398
--- /dev/null
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-glyf.patch
@@ -0,0 +1,17 @@
+diff --git a/src/third_party/ots/src/glyf.cc b/src/third_party/ots/src/glyf.cc
+index ee2898f..1ba4f91 100644
+--- a/src/third_party/ots/src/glyf.cc
++++ b/src/third_party/ots/src/glyf.cc
+@@ -214,7 +214,11 @@ bool ots_glyf_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+     }
+ 
+     table.set_offset(gly_offset);
+-    int16_t num_contours, xmin, ymin, xmax, ymax;
++    int16_t num_contours = 0;
++    int16_t xmin = 0;
++    int16_t ymin = 0;
++    int16_t xmax = 0;
++    int16_t ymax = 0;
+     if (!table.ReadS16(&num_contours) ||
+         !table.ReadS16(&xmin) ||
+         !table.ReadS16(&ymin) ||

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-name.patch b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-name.patch
new file mode 100644 (file)
index 0000000..e075075
--- /dev/null
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-name.patch
@@ -0,0 +1,14 @@
+diff --git a/src/third_party/ots/src/name.cc b/src/third_party/ots/src/name.cc
+index a22211b..7a92595 100644
+--- a/src/third_party/ots/src/name.cc
++++ b/src/third_party/ots/src/name.cc
+@@ -88,7 +88,8 @@ bool ots_name_parse(OpenTypeFile* file, const uint8_t* data, size_t length) {
+   // are invalid name records, but it's not clear that is necessary.
+   for (unsigned i = 0; i < count; ++i) {
+     NameRecord rec;
+-    uint16_t name_length, name_offset;
++    uint16_t name_length = 0;
++    uint16_t name_offset = 0;
+     if (!table.ReadU16(&rec.platform_id) ||
+         !table.ReadU16(&rec.encoding_id) ||
+         !table.ReadU16(&rec.language_id) ||

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-woff2.patch b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-woff2.patch
new file mode 100644 (file)
index 0000000..3bcd0b4
--- /dev/null
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/fix-uninitialized-error-woff2.patch
@@ -0,0 +1,13 @@
+diff --git a/src/third_party/ots/src/woff2.cc b/src/third_party/ots/src/woff2.cc
+index 97aeba9..83f2a36 100644
+--- a/src/third_party/ots/src/woff2.cc
++++ b/src/third_party/ots/src/woff2.cc
+@@ -870,7 +870,7 @@ bool ConvertWOFF2ToTTF(uint8_t* result, size_t result_length,
+   ots::Buffer file(data, length);
+ 
+   uint32_t signature;
+-  uint32_t flavor;
++  uint32_t flavor = 0;
+   if (!file.ReadU32(&signature) || signature != kWoff2Signature ||
+       !file.ReadU32(&flavor)) {
+     return OTS_FAILURE();