security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

Silence two -Wlogical-op warnings.

Browse Source 
* common/tlv.c (parse_ber_header): Avoid compiler warning about a
duplicate condition.
* tools/gpgtar-create.c (pattern_valid_p): Likewise.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-01-05 20:42:55 +01:00
parent 353f6ff376
commit 6170eb8090
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/tlv.c
View File

@ -214,9 +214,9 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
else else
{ {
unsigned long len = 0; 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); return gpg_err_make (default_errsource, GPG_ERR_BAD_BER);
for (; count; count--) for (; count; count--)

6
tools/gpgtar-create.c
View File

@ -429,7 +429,11 @@ pattern_valid_p (const char *pattern)
return 0; return 0;
if (*pattern == '.' && pattern[1] == '.') if (*pattern == '.' && pattern[1] == '.')
return 0; return 0;
if (*pattern == '/' || *pattern == DIRSEP_C) if (*pattern == '/'
#ifdef HAVE_DOSISH_SYSTEM
|| *pattern == '\\'
#endif
)
return 0; /* Absolute filenames are not supported. */ return 0; /* Absolute filenames are not supported. */
#ifdef HAVE_DRIVE_LETTERS #ifdef HAVE_DRIVE_LETTERS
if (((*pattern >= 'a' && *pattern <= 'z') if (((*pattern >= 'a' && *pattern <= 'z')