fixed potential crash

2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 73239b6..501c865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-02  svu
+
+	* libxklavier/xklavier_config_iso.c: changed g_snprintf to more
+	semantically correct g_strlcpy, just to eliminate the warning.
+	* libxklavier/xklavier_props.c: fixed potential crash, reassigning the
+	pointer after realloc (credits go to Canonical)
+
 2009-05-28  svu
 
 	* libxklavier/xklavier_config.c: fixed handling of translated XML
diff --git a/libxklavier/xklavier_props.c b/libxklavier/xklavier_props.c
index 7943fd5..2abe6bc 100644
--- a/libxklavier/xklavier_props.c
+++ b/libxklavier/xklavier_props.c
@@ -374,10 +374,9 @@ xkl_config_rec_get_from_root_window_property(XklConfigRec * data,
 					       --varlen);
 					var[varlen] = '\0';
 					/* Resize the original layout */
-					((char *)
-					 g_realloc(*layout,
-						   laylen + 1))[laylen] =
-					    '\0';
+					*layout =
+					    g_realloc(*layout, laylen + 1);
+					(*layout)[laylen] = '\0';
 				}
 			}
 			layout++;