From af785a684feadf02da2e75c8f8aae8aefddcb78f Mon Sep 17 00:00:00 2001
From: Piotr Diop <piotrx.diop@intel.com>
Date: Thu, 13 Oct 2016 14:55:34 +0200
Subject: [PATCH 1/3] Allow ComponentType to define no child elements.

ComponentTypes can extend one another and include a subelement
by inheritance. Hence the minimum times a sub-sequence can
occur in a componentType shall be 0.

Signed-off-by: Piotr Diop <piotrx.diop@intel.com>
---
 schemas/ComponentTypeSet.xsd | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/schemas/ComponentTypeSet.xsd b/schemas/ComponentTypeSet.xsd
index ec58ebac1..c3d3ec3b8 100644
--- a/schemas/ComponentTypeSet.xsd
+++ b/schemas/ComponentTypeSet.xsd
@@ -3,10 +3,8 @@
     <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="W3cXmlAttributes.xsd"/>
     <xs:include schemaLocation="Parameter.xsd"/>
     <xs:complexType name="ComponentType">
-        <xs:sequence>
-            <xs:sequence maxOccurs="unbounded">
-                <xs:group ref="ParameterBlockGroup"/>
-            </xs:sequence>
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+            <xs:group ref="ParameterBlockGroup"/>
         </xs:sequence>
         <xs:attributeGroup ref="Nameable"/>
         <xs:attribute name="Extends" use="optional"/>

From 749e6654ebf547b844d24551309b991b3488353c Mon Sep 17 00:00:00 2001
From: Mohamed LAHMADI <mohamedx.lahmadi@intel.com>
Date: Fri, 3 Feb 2017 12:11:23 +0100
Subject: [PATCH 2/3] Fix KW issues

Klocwork has reported 2 critical issues in utility/posix/DynamicLibrary.cpp:

Array '(dlError!=nullptr)?dlError:"unknown dlopen error"' of size 21 may use index value(s) 21..INT_MAX
utility/posix/DynamicLibrary.cpp: | DynamicLibrary()
Code: ABV.GENERAL | Severity: Critical(1) | State: Existing | Status: Analyze

Array '(dlError!=nullptr)?dlError:"unknown dlsym error"' of size 20 may use index value(s) 20..INT_MAX
File: utility/posix/DynamicLibrary.cpp: | osGetSymbol()
Code: ABV.GENERAL | Severity: Critical(1) | State: Existing | Status: Analyze

Signed-off-by: Mohamed LAHMADI <mohamedx.lahmadi@intel.com>
---
 utility/posix/DynamicLibrary.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/utility/posix/DynamicLibrary.cpp b/utility/posix/DynamicLibrary.cpp
index 10b5e1706..fc12b7d15 100644
--- a/utility/posix/DynamicLibrary.cpp
+++ b/utility/posix/DynamicLibrary.cpp
@@ -44,7 +44,8 @@ DynamicLibrary::DynamicLibrary(const std::string &path) : _path(osSanitizePathNa
     if (_handle == nullptr) {
 
         const char *dlError = dlerror();
-        throw std::runtime_error((dlError != nullptr) ? dlError : "unknown dlopen error");
+        static const char *unknowDlopenError = "unknown dlopen error";
+        throw std::runtime_error((dlError != nullptr) ? dlError : unknowDlopenError);
     }
 }
 
@@ -60,7 +61,8 @@ void *DynamicLibrary::osGetSymbol(const std::string &symbol) const
     if (sym == nullptr) {
 
         const char *dlError = dlerror();
-        throw std::runtime_error((dlError != nullptr) ? dlError : "unknown dlsym error");
+        static const char *unknowDlsymError = "unknown dlsym error";
+        throw std::runtime_error((dlError != nullptr) ? dlError : unknowDlsymError);
     }
 
     return sym;

From 526d226ff66305c496f28e24f76d3028a50afe6f Mon Sep 17 00:00:00 2001
From: "Di Folco, Neil" <neil.di.folco@intel.com>
Date: Wed, 10 May 2017 15:43:17 +0200
Subject: [PATCH 3/3] Ignore Travis CI and AppVeyor specific files when
 exporting

".travis.yml" and "appveyor.yml" files are now ignored by "git archive".

Signed-off-by: Di Folco, Neil <neil.di.folco@intel.com>
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index b97712247..edb36a86a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
 .version export-subst
 .gitattributes export-ignore
 .gitignore export-ignore
+appveyor.yml export-ignore
+.travis.yml export-ignore