Fix minor issues reported by CodeQL (#421)

merlimat · web-flow · commit 763b85c6c4b9 · 2024-03-27T17:47:42.000+08:00
diff --git a/lib/lz4/lz4.cc b/lib/lz4/lz4.cc
@@ -1175,9 +1175,9 @@ FORCE_INLINE int LZ4_decompress_generic(
                 s = *ip++;
                 length += s;
             } while (likely((endOnInput) ? ip < iend - RUN_MASK : 1) && (s == 255));
-            if ((safeDecode) && unlikely((size_t)(op + length) < (size_t)(op)))
+            if ((safeDecode) && unlikely(length >= (size_t)(oend - op)))
                 goto _output_error; /* overflow detection */
-            if ((safeDecode) && unlikely((size_t)(ip + length) < (size_t)(ip)))
+            if ((safeDecode) && unlikely(length >= (size_t)(iend - ip)))
                 goto _output_error; /* overflow detection */
         }
 
@@ -1220,7 +1220,7 @@ FORCE_INLINE int LZ4_decompress_generic(
                 s = *ip++;
                 length += s;
             } while (s == 255);
-            if ((safeDecode) && unlikely((size_t)(op + length) < (size_t)op))
+            if ((safeDecode) && unlikely(length >= (size_t)(oend - op)))
                 goto _output_error; /* overflow detection */
         }
         length += MINMATCH;
diff --git a/perf/PerfProducer.cc b/perf/PerfProducer.cc
@@ -160,7 +160,7 @@ void startPerfProducer(const Arguments& args, pulsar::ProducerConfiguration& pro
         limiter = std::make_shared<pulsar::RateLimiter>(args.rate);
     }
 
-    producerList.resize(args.numTopics * args.numProducers);
+    producerList.resize((size_t)args.numTopics * args.numProducers);
     for (int i = 0; i < args.numTopics; i++) {
         std::string topic = (args.numTopics == 1) ? args.topic : args.topic + "-" + std::to_string(i);
         LOG_INFO("Adding " << args.numProducers << " producers on topic " << topic);

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ void startPerfProducer(const Arguments& args, pulsar::ProducerConfiguration& pro`
`160`	`160`	`limiter = std::make_shared<pulsar::RateLimiter>(args.rate);`
`161`	`161`	`}`
`162`	`162`
`163`		`- producerList.resize(args.numTopics * args.numProducers);`
	`163`	`+ producerList.resize((size_t)args.numTopics * args.numProducers);`
`164`	`164`	`for (int i = 0; i < args.numTopics; i++) {`
`165`	`165`	`std::string topic = (args.numTopics == 1) ? args.topic : args.topic + "-" + std::to_string(i);`
`166`	`166`	`LOG_INFO("Adding " << args.numProducers << " producers on topic " << topic);`