gpg2/gnupg-2.0.10-fix-convert.patch

16 lines
644 B
Diff
Raw Normal View History

# Patch from upstream - fixes broken make check on ppc, s390, s390x
Index: common/convert.c
===================================================================
--- common/convert.c (revision 4915)
+++ common/convert.c (working copy)
@@ -194,7 +194,9 @@
;
if (*s && (!isascii (*s) || !isspace (*s)) )
return NULL; /* Not followed by Nul or white space. */
- need_nul = !(s[-2] == '0' && s[-1] == '0');
+ /* We need to append a nul character. However we don't want that if
+ the hexstring already ends with "00". */
+ need_nul = ((s == hexstring) || !(s[-2] == '0' && s[-1] == '0'));
if (need_nul)
count++;