From 4f6a0817564a58c88567ddf6a6bd50dc9e7de12f Mon Sep 17 00:00:00 2001
From: David Mathog <>
Date: Thu, 27 Sep 2012 08:53:09 +0200
Subject: fix for 'em' and 'ex' units support (See also: bug #1036010)

(bzr r11668.1.18)
---
 src/xml/repr-css.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/xml/repr-css.cpp')

diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 7fba4d7c6..e0497978a 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -361,8 +361,10 @@ static void sp_repr_css_merge_from_decl(SPCSSAttr *css, CRDeclaration const *con
     * HACK for now is to strip off em and ex units and add them back at the end
     */
     int l = strlen(value_unquoted);
-    if (!strncmp(&value_unquoted[l-2], "em", 2) ||
-            !strncmp(&value_unquoted[l-2], "ex", 2)) {
+    if (l>2 &&
+            (!strncmp(&value_unquoted[l-2], "em", 2) ||
+             !strncmp(&value_unquoted[l-2], "ex", 2)
+            )) {
         units = g_strndup(&value_unquoted[l-2], 2);
         value_unquoted = g_strndup(value_unquoted, l-2);
     }
-- 
cgit v1.2.3