fix some problems detected by cppcheck, issue #5353

diff --git a/src/descrambler/cccam.c b/src/descrambler/cccam.c
index cfb3b1fe869ff0e9b958c5c11fcce2ef871b9dc4..28d44d45643da3cb8b799a50a2a6af9177aa58e7 100644 (file)
--- a/src/descrambler/cccam.c
+++ b/src/descrambler/cccam.c
@@ -333,6 +333,9 @@ cccam_decode_card_data_reply(cccam_t *cccam, uint8_t *msg)
   psa = nprov ? alloca(nprov * sizeof(uint8_t *)) : NULL;
   saa = nprov ? alloca(nprov * 8) : NULL;
 
+  if (pid == NULL || psa == NULL || saa == NULL)
+    return -ENOMEM;
+
   msg2 = msg + 25;
   memset(saa, 0, nprov * 8);
   for (i = 0; i < nprov; i++) {

diff --git a/src/prop.h b/src/prop.h
index d5610035403039ac0440175f46755992eaffd22a..3739422815284454995aa633eb41cf16720db35e 100644 (file)
--- a/src/prop.h
+++ b/src/prop.h
@@ -72,11 +72,11 @@ typedef enum {
  * min/max/step helpers
  */
 #define INTEXTRA_RANGE(min, max, step) \
-  ((1<<31)|(((step)&0x7f)<<24)|(((max)&0xfff)<<12)|((min)&0xfff))
+  ((1<<31U)|(((step)&0x7fU)<<24)|(((max)&0xfffU)<<12)|((min)&0xfffU))
 
-#define INTEXTRA_IS_RANGE(e) (((e) & (1<<31)) != 0)
+#define INTEXTRA_IS_RANGE(e) (((e) & (1<<31U)) != 0)
 #define INTEXTRA_IS_SPLIT(e) !INTEXTRA_IS_RANGE(e)
-#define INTEXTRA_GET_STEP(e) (((e)>>24)&0x7f)
+#define INTEXTRA_GET_STEP(e) (((e)>>24)&0x7fU)
 #define INTEXTRA_GET_MAX(e)  ((e)&(1<<23)?-(0x800-(((e)>>12)&0x7ff)):(((e)>>12)&0x7ff))
 #define INTEXTRA_GET_MIN(e)  ((e)&(1<<11)?-(0x800-((e)&0x7ff)):((e)&0x7ff))
 #define INTEXTRA_GET_UMAX(e) (((e)>>12)&0xfff)