Merge pull request #4518 from ZoneMinder/copilot/fix-time-t-format-specifier

Fix time_t format specifiers for ILP32 platforms with 64-bit time_t

Author: connortechnology

_codeql_detected_source_root

@@ -0,0 +1 @@
+.

src/zm_event.cpp

@@ -201,8 +201,8 @@ Event::~Event() {
   }
 
   std::string sql = stringtf(
-      "UPDATE Events SET Name='%s%" PRIu64 "', EndDateTime = from_unixtime(%ld), Length = %.2f, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d, MaxScoreFrameId=%d, DefaultVideo='%s', DiskSpace=%" PRIu64 " WHERE Id = %" PRIu64 " AND Name='New Event'",
-      monitor->Substitute(monitor->EventPrefix(), start_time).c_str(), id, std::chrono::system_clock::to_time_t(end_time),
+      "UPDATE Events SET Name='%s%" PRIu64 "', EndDateTime = from_unixtime(%jd), Length = %.2f, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d, MaxScoreFrameId=%d, DefaultVideo='%s', DiskSpace=%" PRIu64 " WHERE Id = %" PRIu64 " AND Name='New Event'",
+      monitor->Substitute(monitor->EventPrefix(), start_time).c_str(), id, static_cast<intmax_t>(std::chrono::system_clock::to_time_t(end_time)),
       delta_time.count(),
       frames, alarm_frames,
       tot_score, static_cast<uint32>(alarm_frames ? (tot_score / alarm_frames) : 0), max_score, max_score_frame_id,
@@ -213,8 +213,8 @@ Event::~Event() {
   if (!zmDbDoUpdate(sql)) {
     // Name might have been changed during recording, so just do the update without changing the name.
     sql = stringtf(
-        "UPDATE Events SET EndDateTime = from_unixtime(%ld), Length = %.2f, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d, MaxScoreFrameId=%d, DefaultVideo='%s', DiskSpace=%" PRIu64 " WHERE Id = %" PRIu64,
-        std::chrono::system_clock::to_time_t(end_time),
+        "UPDATE Events SET EndDateTime = from_unixtime(%jd), Length = %.2f, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d, MaxScoreFrameId=%d, DefaultVideo='%s', DiskSpace=%" PRIu64 " WHERE Id = %" PRIu64,
+        static_cast<intmax_t>(std::chrono::system_clock::to_time_t(end_time)),
         delta_time.count(),
         frames, alarm_frames,
         tot_score, static_cast<uint32>(alarm_frames ? (tot_score / alarm_frames) : 0), max_score, max_score_frame_id,
@@ -392,10 +392,10 @@ void Event::WriteDbFrames() {
   while (frame_data.size()) {
     Frame *frame = frame_data.front();
     frame_data.pop();
-    frame_insert_sql += stringtf("\n( %" PRIu64 ", %d, '%s', from_unixtime( %ld ), %.2f, %d ),",
+    frame_insert_sql += stringtf("\n( %" PRIu64 ", %d, '%s', from_unixtime( %jd ), %.2f, %d ),",
                                  id, frame->frame_id,
                                  frame_type_names[frame->type],
-                                 std::chrono::system_clock::to_time_t(frame->timestamp),
+                                 static_cast<intmax_t>(std::chrono::system_clock::to_time_t(frame->timestamp)),
                                  std::chrono::duration_cast<FPSeconds>(frame->delta).count(),
                                  frame->score);
     if (config.record_event_stats and frame->zone_stats.size()) {

src/zm_logger.cpp

@@ -531,8 +531,8 @@ void Logger::logPrint(bool hex, const char *filepath, int line, int level, const
                                  "INSERT INTO `Logs` "
                                  "( `TimeKey`, `Component`, `ServerId`, `Pid`, `Level`, `Code`, `Message`, `File`, `Line` )"
                                  " VALUES "
-                                 "( %ld.%06" PRIi64 ", '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
-                                 now_sec, static_cast<int64>(now_frac.count()), mId.c_str(), staticConfig.SERVER_ID, tid, level, classString,
+                                 "( %jd.%06" PRIi64 ", '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
+                                 static_cast<intmax_t>(now_sec), static_cast<int64>(now_frac.count()), mId.c_str(), staticConfig.SERVER_ID, tid, level, classString,
                                  escapedString.c_str(), file, line);
       dbQueue.push(std::move(sql_string));
     }

src/zm_rtp_source.cpp

@@ -203,17 +203,17 @@ void RtpSource::updateRtcpData(
   timeval ntpTime = zm::chrono::duration_cast<timeval>(
                       Seconds(ntpTimeSecs) + Microseconds((Microseconds::period::den * (ntpTimeFrac >> 16)) / (1 << 16)));
 
-  Debug(5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime);
+  Debug(5, "ntpTime: %jd.%06ld, rtpTime: %x", static_cast<intmax_t>(ntpTime.tv_sec), ntpTime.tv_usec, rtpTime);
 
   if ( mBaseTimeNtp.tv_sec == 0 ) {
     mBaseTimeReal = std::chrono::system_clock::now();
     mBaseTimeNtp = ntpTime;
     mBaseTimeRtp = rtpTime;
   } else if ( !mRtpClock ) {
-    Debug(5, "lastSrNtpTime: %ld.%06ld, rtpTime: %x"
-          "ntpTime: %ld.%06ld, rtpTime: %x",
-          mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime,
-          ntpTime.tv_sec, ntpTime.tv_usec, rtpTime);
+    Debug(5, "lastSrNtpTime: %jd.%06ld, rtpTime: %x"
+          "ntpTime: %jd.%06ld, rtpTime: %x",
+          static_cast<intmax_t>(mLastSrTimeNtp.tv_sec), mLastSrTimeNtp.tv_usec, rtpTime,
+          static_cast<intmax_t>(ntpTime.tv_sec), ntpTime.tv_usec, rtpTime);
 
     FPSeconds diffNtpTime =
       zm::chrono::duration_cast<Microseconds>(ntpTime) - zm::chrono::duration_cast<Microseconds>(mBaseTimeNtp);

src/zm_rtsp_server_device_source.cpp

@@ -107,9 +107,9 @@ void ZoneMinderDeviceSource::deliverFrame() {
   } else {
     fFrameSize = nal_size;
   }
-  Debug(2, "deliverFrame stream: %d timestamp: %ld.%06ld size: %d queuesize: %d",
+  Debug(2, "deliverFrame stream: %d timestamp: %jd.%06ld size: %d queuesize: %d",
         m_stream->index,
-        frame->m_timestamp.tv_sec, frame->m_timestamp.tv_usec,
+        static_cast<intmax_t>(frame->m_timestamp.tv_sec), frame->m_timestamp.tv_usec,
         fFrameSize,
         m_captureQueue.size()
        );