[Pkg-gnupg-commit] [gnupg2] 19/132: gpgscm: Fix compact vector encoding.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed May 17 03:07:36 UTC 2017


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit bf8b5e9042b3d86d419b2ac1987a9298c9d21500
Author: Justus Winter <justus at g10code.com>
Date:   Fri Apr 7 12:27:47 2017 +0200

    gpgscm: Fix compact vector encoding.
    
    * tests/gpgscm/scheme-private.h (struct cell): Use uintptr_t for
    '_flags'.  This way, '_flags' has the size of a machine word.
    --
    
    The compact vector representation introduced in 49e2ae65 requires that
    we can tell apart pointers and type flags.  This did not work on
    64-bit big-endian architectures.
    
    Fixes a crash on 64-bit big-endian architectures.
    
    Hat-tip-to: gniibe
    Fixes-commit: 49e2ae65e892f93be7f87cfaae3392b50a99e4b1
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/gpgscm/scheme-private.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/gpgscm/scheme-private.h b/tests/gpgscm/scheme-private.h
index abd89e8..fe50135 100644
--- a/tests/gpgscm/scheme-private.h
+++ b/tests/gpgscm/scheme-private.h
@@ -3,6 +3,7 @@
 #ifndef _SCHEME_PRIVATE_H
 #define _SCHEME_PRIVATE_H
 
+#include <stdint.h>
 #include "scheme.h"
 /*------------------ Ugly internals -----------------------------------*/
 /*------------------ Of interest only to FFI users --------------------*/
@@ -42,7 +43,7 @@ typedef struct port {
 
 /* cell structure */
 struct cell {
-  unsigned int _flag;
+  uintptr_t _flag;
   union {
     struct {
       char   *_svalue;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list