From: iceman1001 <iceman@iuse.se>
Date: Tue, 2 Aug 2016 14:06:40 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/e719470c461e38fb3ad99416d06fa1b5b19ff357?hp=5f7e30f8d52794f6e09e07f0bd078d565f801994

Merge branch 'master' of https://github.com/iceman1001/proxmark3
---

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index da1b20b1..731cead1 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -527,8 +527,7 @@ int CmdLegicRfRawWrite(const char *Cmd) {
 		PrintAndLog("# changing the DCF is irreversible  #");
 		PrintAndLog("#####################################");
 		PrintAndLog("do youe really want to continue? y(es) n(o)");		
-		scanf(" %c", &answer);
-		if (answer == 'y' || answer == 'Y') {
+		if (scanf(" %c", &answer) > 0 && (answer == 'y' || answer == 'Y')) {
 			SendCommand(&c);
 			return 0;
 		}
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 119a434e..64e4a2db 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -140,7 +140,7 @@ filtop(FILE *input, unsigned long length, int flags, int bperhx) {
 	bmp_t accu = BMP_C(0);
 	bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
 	unsigned long iter = 0UL, idx;
-	int cmask = ~(~0 << CHAR_BIT), c;
+	int cmask = (1 << CHAR_BIT) - 1, c;
 	int count = 0, ofs;
 	poly_t poly = PZERO;
 	if(bperhx == 0) return(poly);
@@ -205,7 +205,7 @@ strtop(const char *string, int flags, int bperhx) {
 	bmp_t accu;
 	bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
 	int pass, count, ofs;
-	int cmask = ~(~0 << CHAR_BIT), c;
+	int cmask = (1 << CHAR_BIT) - 1 , c;
 	const char *s;
 
 	poly_t poly = PZERO;
diff --git a/zlib/inflate.c b/zlib/inflate.c
index 4e9c07ce..3a945f3c 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -1523,7 +1523,8 @@ z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return (long)(((unsigned long)0 - 1) << 16);
     state = (struct inflate_state FAR *)strm->state;
     return ((long)(state->back) << 16) +
         (state->mode == COPY ? state->length :