X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=gnupg2.git;a=blobdiff_plain;f=common%2Ftlv.c;h=0058b67ca19fee3fbbfb84498910c21c71da9d22;hp=6813c585afb70b35367317dd3854b6a2c36085ee;hb=f160646e889c9b031f2136185dd4416ba43ca9ab;hpb=2124e87c191dc6939b52ad06726e15ffff9a5936

diff --git a/common/tlv.c b/common/tlv.c
index 6813c58..0058b67 100644
--- a/common/tlv.c
+++ b/common/tlv.c
@@ -214,9 +214,9 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
   else
     {
       unsigned long len = 0;
-      int count = c & 0x7f;
+      int count = (c & 0x7f);
 
-      if (count > sizeof (len) || count > sizeof (size_t))
+      if (count > (sizeof(len)<sizeof(size_t)?sizeof(len):sizeof(size_t)))
         return gpg_err_make (default_errsource, GPG_ERR_BAD_BER);
 
       for (; count; count--)