svn commit: r438068 - head/devel/qca/files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sat Apr  8 21:33:40 2017
New Revision: 438068
URL: https://svnweb.freebsd.org/changeset/ports/438068

Log:
  Add upstream patch to fix the build on ARMv6.
  
  PR:		217371
  Submitted by:	mikael.urankar at gmail.com
  MFH:		2017Q2

Added:
  head/devel/qca/files/patch-git_601fd3   (contents, props changed)

Added: head/devel/qca/files/patch-git_601fd3
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qca/files/patch-git_601fd3	Sat Apr  8 21:33:40 2017	(r438068)
@@ -0,0 +1,39 @@
+From 601fd3a05141c614ae48a3ddac44194d669eaae1 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eb at emlix.com>
+Date: Mon, 27 Jun 2016 12:55:51 +0200
+Subject: fix base64 decoding on ARM
+
+This code was broken on ARM and other architectures where "char" is unsigned by
+default.
+
+First, it breaks with newer compilers with errors like:
+
+  .../src/qca_textfilter.cpp:314:2: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
+
+Second, if the compiler would just allow this conversion then the unsigned char
+would hold 255, which would not be sign extended when cast to an int later, so
+all the checks "< 0" will never trigger, and so invalid input characters cannot
+be detected.
+
+REVIEW:128295
+BUG:364495
+---
+ src/qca_textfilter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qca_textfilter.cpp b/src/qca_textfilter.cpp
+index 9889a24..3baf511 100644
+--- src/qca_textfilter.cpp
++++ src/qca_textfilter.cpp
+@@ -293,7 +293,7 @@ static QByteArray b64decode(const QByteArray &s, bool *ok)
+ 	// 64 specifies eof
+ 	// everything else specifies data
+ 
+-	static char tbl[] =
++	static signed char tbl[] =
+ 	{
+ 		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ 		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+-- 
+cgit v0.11.2
+