Author: cazfi
Date: Fri Feb  5 16:07:08 2016
New Revision: 31764

URL: http://svn.gna.org/viewcvs/freeciv?rev=31764&view=rev
Log:
Increased size of some static text buffers that were proving too small for
translations containing a lot of multi-byte UTF-8 characters.

All reported by Konstantin Vedeneev, patch by Konstantin Vedeneev and myself

See bug #24328

Modified:
    branches/S2_5_3/client/cityrepdata.c
    branches/S2_5_3/common/version.c
    branches/S2_5_3/server/console.h
    branches/S2_5_3/server/settings.c

Modified: branches/S2_5_3/client/cityrepdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/client/cityrepdata.c?rev=31764&r1=31763&r2=31764&view=diff
==============================================================================
--- branches/S2_5_3/client/cityrepdata.c        (original)
+++ branches/S2_5_3/client/cityrepdata.c        Fri Feb  5 16:07:08 2016
@@ -102,7 +102,7 @@
 static const char *cr_entry_hstate_verbose(const struct city *pcity,
                                           const void *data)
 {
-  static char buf[16];
+  static char buf[32];
   fc_snprintf(buf, sizeof(buf), "%s",
               (city_celebrating(pcity) ? Q_("?city_state:Celebrating")
                : (city_unhappy(pcity) ? Q_("?city_state:Disorder")
@@ -516,7 +516,7 @@
 static const char *cr_entry_building(const struct city *pcity,
                                     const void *data)
 {
-  static char buf[128];
+  static char buf[192];
   const char *from_worklist =
     worklist_is_empty(&pcity->worklist) ? "" :
     concise_city_production ? "+" : _("(worklist)");

Modified: branches/S2_5_3/common/version.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/common/version.c?rev=31764&r1=31763&r2=31764&view=diff
==============================================================================
--- branches/S2_5_3/common/version.c    (original)
+++ branches/S2_5_3/common/version.c    Fri Feb  5 16:07:08 2016
@@ -38,7 +38,7 @@
 ***********************************************************************/
 const char *freeciv_name_version(void)
 {
-  static char msgbuf[128];
+  static char msgbuf[256];
 
 #if IS_BETA_VERSION
   fc_snprintf(msgbuf, sizeof (msgbuf), _("Freeciv version %s %s"),

Modified: branches/S2_5_3/server/console.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/server/console.h?rev=31764&r1=31763&r2=31764&view=diff
==============================================================================
--- branches/S2_5_3/server/console.h    (original)
+++ branches/S2_5_3/server/console.h    Fri Feb  5 16:07:08 2016
@@ -13,9 +13,10 @@
 #ifndef FC__CONSOLE_H
 #define FC__CONSOLE_H
 
+/* utility */
 #include "support.h"            /* bool type and fc__attribute */
 
-#define MAX_LEN_CONSOLE_LINE 512       /* closing \0 included */
+#define MAX_LEN_CONSOLE_LINE 1024  /* closing '\0' included */
 
 /* 
  * A note on "rfc-style":

Modified: branches/S2_5_3/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5_3/server/settings.c?rev=31764&r1=31763&r2=31764&view=diff
==============================================================================
--- branches/S2_5_3/server/settings.c   (original)
+++ branches/S2_5_3/server/settings.c   Fri Feb  5 16:07:08 2016
@@ -3234,7 +3234,7 @@
   int bit;
 
   if (pretty) {
-    char buf2[64];
+    char buf2[256];
     struct astring astr = ASTRING_INIT;
     struct strvec *vec = strvec_new();
     size_t len;


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to