From e28c79f7175d9b00829ab06b60b158ced02009c2 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Thu, 25 Nov 2021 15:49:19 +0100
Subject: [PATCH] Fixed some warnings

---
 src/EmbeddableWebServer.h     | 2 +-
 src/main.cpp                  | 2 +-
 src/video_capture/testcard2.c | 6 +++---
 src/video_display/aggregate.c | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/EmbeddableWebServer.h b/src/EmbeddableWebServer.h
index a89cf93ff..133a3667b 100755
--- a/src/EmbeddableWebServer.h
+++ b/src/EmbeddableWebServer.h
@@ -503,7 +503,7 @@ char* strdupDecodeGETorPOSTParam(const char* paramNameIncludingEquals, const cha
     /* Ok paramStart points at -->"name=" ; let's make it point at "=" */
     paramStart = strstr(paramStart, "=");
     if (NULL == paramStart) {
-        ews_printf("It's very suspicious that we couldn't find an equals sign after searching for '%s' in '%s'\n", paramStart, paramString);
+        ews_printf("It's very suspicious that we couldn't find an equals sign after searching for 'name=' in '%s'\n", paramString);
         return strdupIfNotNull(valueIfNotFound);
     }
     /* We need to skip past the "=" */
diff --git a/src/main.cpp b/src/main.cpp
index e08945c32..c66112b11 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -288,7 +288,7 @@ static void crash_signal_handler(int sig)
         append(&ptr, ptr_end, "\n" PACKAGE_NAME " has crashed");
 #ifndef WIN32
         char backtrace_msg[] = "Backtrace:\n";
-        write(2, backtrace_msg, sizeof backtrace_msg);
+        write_all(sizeof backtrace_msg, backtrace_msg);
         array<void *, 256> addresses{};
         int num_symbols = backtrace(addresses.data(), addresses.size());
         backtrace_symbols_fd(addresses.data(), num_symbols, 2);
diff --git a/src/video_capture/testcard2.c b/src/video_capture/testcard2.c
index 46de0305c..1c2d70d65 100644
--- a/src/video_capture/testcard2.c
+++ b/src/video_capture/testcard2.c
@@ -398,12 +398,12 @@ void * vidcap_testcard2_thread(void *arg)
                 SDL_FillRect(surf, &r, 0xffffffff);
                 
 #ifdef HAVE_LIBSDL_TTF                
-                char frames[20];
+                char frames[64];
                 double since_start = tv_diff(next_frame_time, s->start_time);
-                snprintf(frames, 20, "%02d:%02d:%02d %3d", (int) since_start / 3600 ,
+                snprintf(frames, sizeof frames, "%02d:%02d:%02d %3d", (int) since_start / 3600,
                                 (int) since_start / 60 % 60,
                                 (int) since_start % 60,
-                                 s->count % (int)s->frame->fps);
+                                 s->count % (int) s->frame->fps);
                 text = TTF_RenderText_Solid(font,
                         frames, col);
 #endif
diff --git a/src/video_display/aggregate.c b/src/video_display/aggregate.c
index ba88e64ec..e04b864c5 100644
--- a/src/video_display/aggregate.c
+++ b/src/video_display/aggregate.c
@@ -275,6 +275,7 @@ static int display_aggregate_get_property(void *state, int property, void *val,
                                 codec_t **codecs = malloc(s->devices_cnt * sizeof(codec_t *));
                                 size_t *lens = malloc(s->devices_cnt * sizeof(size_t));
 
+                                assert(s->devices_cnt > 0);
                                 for (i = 0; i < s->devices_cnt; ++i) {
                                         codecs[i] = malloc(*len);
                                         lens[i] = *len;