summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-06-02 19:30:31 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-06-02 19:30:31 +0000
commit9663ade3f376a00f8d66daf3ad7c89a1b521da16 (patch)
treee585a8170205aa6f32f1e24617a02e9da0f1f8d9
parentf1c30092b3ed327d2853d3b4dff4b7f00f6b01a4 (diff)
downloadpango-9663ade3f376a00f8d66daf3ad7c89a1b521da16.tar.gz
Don't g_return if text == NULL and length == 0.
2006-06-02 Behdad Esfahbod <behdad@gnome.org> * pango/pango-utils.c (pango_find_base_dir): Don't g_return if text == NULL and length == 0.
-rw-r--r--ChangeLog5
-rw-r--r--pango/pango-utils.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index efeb351f..3972205f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02 Behdad Esfahbod <behdad@gnome.org>
+
+ * pango/pango-utils.c (pango_find_base_dir): Don't g_return if text ==
+ NULL and length == 0.
+
2006-05-31 Behdad Esfahbod <behdad@gnome.org>
Bug 341138 – Using TTC font, Gtk2 programs begin to eating big memory
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 2fc96f8a..5094f083 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -1755,7 +1755,7 @@ pango_find_base_dir (const gchar *text,
PangoDirection dir = PANGO_DIRECTION_NEUTRAL;
const gchar *p;
- g_return_val_if_fail (text != NULL, PANGO_DIRECTION_NEUTRAL);
+ g_return_val_if_fail (text != NULL || length == 0, PANGO_DIRECTION_NEUTRAL);
p = text;
while ((length < 0 || p < text + length) && *p)