try to fix some CodeQL warnings

Signed-off-by: Rosen Penev <[email protected]>
Exiv2 · Jan 28, 2025 · 112112e · 112112e
1 parent 5b5cea0
commit 112112e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/exiv2.cpp b/app/exiv2.cpp
@@ -1005,7 +1005,7 @@ void Params::getStdin(Exiv2::DataBuf& buf) {
 
 int Params::getopt(int argc, char* const Argv[]) {
   std::vector<char*> argv(argc + 1);
-  argv[argc] = nullptr;
+  argv.back() = nullptr;
 
   const std::unordered_map<std::string, std::string> longs{
       {"--adjust", "-a"},    {"--binary", "-b"},  {"--comment", "-c"}, {"--delete", "-d"},   {"--days", "-D"},

diff --git a/src/fujimn_int.cpp b/src/fujimn_int.cpp
@@ -283,10 +283,11 @@ constexpr TagDetails fujiDriveSettingByte1[] = {
 
 //! DriveSetting, tag 0x1103
 static std::ostream& printFujiDriveSetting(std::ostream& os, const Value& value, const ExifData*) {
-  auto byte1 = value.toInt64() & 0xff;
-  auto byte2 = (value.toInt64() >> 8) & 0xff;
-  auto byte3 = (value.toInt64() >> 16) & 0xff;
-  auto fps = value.toInt64() >> 24;
+  auto valint = value.toUint32();
+  auto byte1 = valint & 0xff;
+  auto byte2 = (valint >> 8) & 0xff;
+  auto byte3 = (valint >> 16) & 0xff;
+  auto fps = valint >> 24;
 
   if (auto setting = Exiv2::find(fujiDriveSettingByte1, byte1)) {
     os << exvGettext(setting->label_);

diff --git a/src/preview.cpp b/src/preview.cpp
@@ -819,7 +819,8 @@ bool LoaderXmpJpeg::readDimensions() {
 DataBuf decodeHex(const byte* src, size_t srcSize) {
   // create decoding table
   byte invalid = 16;
-  auto decodeHexTable = std::vector<byte>(256, invalid);
+  std::array<byte, 256> decodeHexTable;
+  decodeHexTable.fill(invalid);
   for (byte i = 0; i < 10; i++)
     decodeHexTable[static_cast<byte>('0') + i] = i;
   for (byte i = 0; i < 6; i++)