Fix decompose() implementations to work with non-starter non-composables

[framework/uifw/harfbuzz.git] / src / hb-common.cc

diff --git a/src/hb-common.cc b/src/hb-common.cc
index 20993c6..a886474 100644 (file)
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -169,16 +169,17 @@ hb_language_t
 hb_language_from_string (const char *str)
 {
   if (!str || !*str)
-    return NULL;
+    return HB_LANGUAGE_INVALID;
 
   hb_language_item_t *item = langs.find_or_insert (str, langs_lock);
 
-  return likely (item) ? item->lang : NULL;
+  return likely (item) ? item->lang : HB_LANGUAGE_INVALID;
 }
 
 const char *
 hb_language_to_string (hb_language_t language)
 {
+  /* This is actually NULL-safe! */
   return language->s;
 }