From e084d91b55b9690cd89a60823c0be66929fc6d78 Mon Sep 17 00:00:00 2001
From: atlaua <luchsmail-gh@yahoo.com>
Date: Thu, 3 Nov 2011 14:24:20 +0100
Subject: [PATCH 1/2] Resolved a todo in main.c

---
 src/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index 57760d777..798f4f830 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3544,7 +3544,11 @@ int main(int argc, char *argv[])
 			if (sdl_mod&(KMOD_CAPS))
 				strappend(uitext, " [CAP LOCKS]");
 			if (GRID_MODE)
-				sprintf(uitext, "%s [GRID: %d]", uitext, GRID_MODE); //TODO: Undefined behavior: variable is used as parameter and destination in sprintf().
+			{
+				char gridtext[15];
+				sprintf(gridtext, " [GRID: %d]", GRID_MODE);
+				strappend(uitext, gridtext);
+			}
 #ifdef INTERNAL
 			if (vs)
 				strappend(uitext, " [FRAME CAPTURE]");

From ae26ecaf8d79687c9f8bf683706b009f1c55e812 Mon Sep 17 00:00:00 2001
From: atlaua <luchsmail-gh@yahoo.com>
Date: Thu, 3 Nov 2011 19:25:49 +0100
Subject: [PATCH 2/2] Prevented a malloc-related problem in interface.c from
 occuring.

---
 src/interface.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/interface.c b/src/interface.c
index 8311dd9a1..28a89de30 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -3407,12 +3407,16 @@ int search_ui(pixel *vid_buf)
 				thumb_cache_add(img_id[i], thumb, thlen);
 				for (pos=0; pos<GRID_X*GRID_Y; pos++) {
 					if (search_dates[pos]) {
-						char *id_d_temp = malloc(strlen(search_ids[pos])+strlen(search_dates[pos])+1);
+						char *id_d_temp = malloc(strlen(search_ids[pos])+strlen(search_dates[pos])+2);
+						if (id_d_temp == 0)
+						{
+							break;
+						}
 						strcpy(id_d_temp, search_ids[pos]);
 						strappend(id_d_temp, "_");
 						strappend(id_d_temp, search_dates[pos]);
 						//img_id[i] = mystrdup(id_d_temp);
-						if (id_d_temp && !strcmp(id_d_temp, img_id[i])) {
+						if (!strcmp(id_d_temp, img_id[i])) {
 							break;
 						}
 					} else {