Prevent negitive numbers from being used as the left operand of shift operator.

diff --git a/Makefile b/Makefile
index d419daaa62d866110c9131b3e717ac2c9906bddb..2ab06ddaf45577e9d3420a52f098f2756cfd5812 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,6 @@ SPLINTFLAGS =            \
     -temptrans           \
     -usereleased         \
     -warnposix           \
-    -shiftimplementation \
     +charindex           \
     -kepttrans           \
     -unqualifiedtrans    \

diff --git a/lexer.h b/lexer.h
index 24ac39a63f7f574d1e9a8a7dfc1f8236cc51612a..2573fb209c6077ff8931546845e952053e268367 100644 (file)
--- a/lexer.h
+++ b/lexer.h
@@ -163,9 +163,14 @@ typedef struct {
     unsigned int flags;
 } oper_info;
 
-#define opid1(a) (a)
-#define opid2(a,b) ((a<<8)|b)
-#define opid3(a,b,c) ((a<<16)|(b<<8)|c)
+/*
+ * Explicit uint8_t casts since the left operand of shift operator cannot
+ * be negative, even though it won't happen, this supresses the future
+ * possibility.
+ */
+#define opid1(a)     ((uint8_t)a)
+#define opid2(a,b)   (((uint8_t)a<<8) |(uint8_t)b)
+#define opid3(a,b,c) (((uint8_t)a<<16)|((uint8_t)b<<8)|(uint8_t)c)
 
 static const oper_info c_operators[] = {
     { "(",   0, opid1('('),         ASSOC_LEFT,  99, OP_PREFIX}, /* paren expression - non function call */

diff --git a/pak.c b/pak.c
index 0f90d675133dbca860bf9aa709f89d0a3cb7f411..048469b9d497c47315236b2b663d9e9bceb00c71 100644 (file)
--- a/pak.c
+++ b/pak.c
@@ -26,7 +26,7 @@
  * The PAK format uses a FOURCC concept for storing the magic ident within
  * the header as a uint32_t.
  */
-#define PAK_FOURCC ((uint32_t)(('P' | ('A' << 8) | ('C' << 16) | ('K' << 24))))
+#define PAK_FOURCC ((uint32_t)(((uint8_t)'P'|((uint8_t)'A'<<8)|((uint8_t)'C'<<16)|((uint8_t)'K'<<24))))
 
 typedef struct {
     uint32_t magic;  /* "PACK" */