[SCM] openni2/master: Add patch for GCC7

jspricke at users.alioth.debian.org jspricke at users.alioth.debian.org
Tue Feb 7 17:42:25 UTC 2017


The following commit has been merged in the master branch:
commit e5d4f532096510f0b75ebe9269f0cf10f7a1902f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Feb 7 17:35:36 2017 +0100

    Add patch for GCC7
    
    Closes: #853597

diff --git a/debian/patches/0014-fix-format-overflow-for-GCC7.patch b/debian/patches/0014-fix-format-overflow-for-GCC7.patch
new file mode 100644
index 0000000..98c3922
--- /dev/null
+++ b/debian/patches/0014-fix-format-overflow-for-GCC7.patch
@@ -0,0 +1,37 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 7 Feb 2017 17:30:41 +0100
+Subject: fix format-overflow for GCC7
+
+---
+ Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp | 4 ++--
+ Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp b/Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp
+index 9663e41..62cf1c7 100644
+--- a/Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp
++++ b/Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp
+@@ -40,8 +40,8 @@ XnFrameStreamProcessor::XnFrameStreamProcessor(XnFrameStream* pStream, XnSensorS
+ 	m_nLastSOFPacketID(0),
+ 	m_nFirstPacketTimestamp(0)
+ {
+-	sprintf(m_csInDumpMask, "%sIn", pStream->GetType());
+-	sprintf(m_csInternalDumpMask, "Internal%s", pStream->GetType());
++	snprintf(m_csInDumpMask, 100, "%.90sIn", pStream->GetType());
++	snprintf(m_csInternalDumpMask, 100, "Internal%.90s", pStream->GetType());
+ 	m_InDump = xnDumpFileOpen(m_csInDumpMask, "%s_0.raw", m_csInDumpMask);
+ 	m_InternalDump = xnDumpFileOpen(m_csInternalDumpMask, "%s_0.raw", m_csInternalDumpMask);
+ }
+diff --git a/Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp b/Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp
+index f93f333..d962ec0 100644
+--- a/Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp
++++ b/Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp
+@@ -263,7 +263,7 @@ XnStatus XnSensorFirmwareParams::AddFirmwareParam(XnActualIntProperty& Property,
+ 	XN_IS_STATUS_OK(nRetVal);
+ 
+ 	XnChar csNewName[XN_DEVICE_MAX_STRING_LENGTH];
+-	sprintf(csNewName, "%s (%d)", Property.GetName(), nFirmwareParam);
++	snprintf(csNewName, XN_DEVICE_MAX_STRING_LENGTH, "%.150s (%d)", Property.GetName(), nFirmwareParam);
+ 
+ 	Property.UpdateName("Firmware", csNewName);
+ 	Property.SetLogSeverity(XN_LOG_VERBOSE);
diff --git a/debian/patches/series b/debian/patches/series
index a690e7b..07fc5f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0011-Mark-variables-unused.patch
 0012-generic-linux.patch
 0013-Fix-GCC6-compilation.patch
+0014-fix-format-overflow-for-GCC7.patch

-- 
openni2 packaging



More information about the pkg-multimedia-commits mailing list