[PATCH 1/4] Increase various stack buffer sizes to accommodate for locale strings

Lubomir I. Ivanov neolit123 at gmail.com
Wed Oct 17 14:43:47 PDT 2012


From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

Example:
For some strings such as the "Trip title" the buffer of 60 bytes was not
enought for certain languages.

Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
 divelist.c | 3 ++-
 info.c     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/divelist.c b/divelist.c
index d78f3d6..f1c39e0 100644
--- a/divelist.c
+++ b/divelist.c
@@ -363,7 +363,8 @@ static void date_data_func(GtkTreeViewColumn *col,
 	int idx, nr;
 	struct tm tm;
 	timestamp_t when;
-	char buffer[60];
+	/* this should be enought for most languages. if not increase the value. */
+	char buffer[256];
 
 	gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DATE, &when, -1);
 	nr = gtk_tree_model_iter_n_children(model, iter);
diff --git a/info.c b/info.c
index 613a2d1..b59b899 100644
--- a/info.c
+++ b/info.c
@@ -452,7 +452,7 @@ static void save_dive_info_changes(struct dive *dive, struct dive *master, struc
 static void dive_trip_widget(GtkWidget *box, dive_trip_t *trip, struct dive_info *info)
 {
 	GtkWidget *hbox, *label;
-	char buffer[80] = N_("Edit trip summary");
+	char buffer[128] = N_("Edit trip summary");
 
 	label = gtk_label_new(_(buffer));
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
@@ -470,7 +470,7 @@ static void dive_trip_widget(GtkWidget *box, dive_trip_t *trip, struct dive_info
 static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info, gboolean multi)
 {
 	GtkWidget *hbox, *label, *frame, *equipment;
-	char buffer[80];
+	char buffer[128];
 
 	snprintf(buffer, sizeof(buffer), "%s", _("Edit multiple dives"));
 
-- 
1.7.11.msysgit.0



More information about the subsurface mailing list