[EGIT] [apps/terminology] master 01/01: fix segv on word set search

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=cd0bfa5d0c91944c015fae51e400c17b0b6f2113

commit cd0bfa5d0c91944c015fae51e400c17b0b6f2113
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Fri Aug 15 20:00:24 2014 +0900

    fix segv on word set search
---
 src/bin/termio.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/bin/termio.c b/src/bin/termio.c
index 74acb68..2974b47 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -2597,19 +2597,18 @@ _codepoint_is_wordsep(const Eina_Unicode g)
        0xff65,
        0xe002a
    };
-   size_t imax = sizeof(wordsep)/sizeof(wordsep[0]) - 1,
+   size_t imax = (sizeof(wordsep) / sizeof(wordsep[0])) - 1,
           imin = 0;
 
-  while (imax >= imin)
-    {
-      size_t imid = (imin + imax) / 2;
-      if (wordsep[imid] == g)
-        return EINA_TRUE;
-      else if (wordsep[imid] < g)
-        imin = imid + 1;
-      else
-        imax = imid - 1;
-    }
+   while (imax >= imin)
+     {
+        size_t imid = (imin + imax) / 2;
+
+        if (wordsep[imid] == g) return EINA_TRUE;
+        else if (wordsep[imid] < g) imin = imid + 1;
+        else imax = imid - 1;
+        if ((imax == imin) || (imid == 0)) break;
+     }
    return EINA_FALSE;
 }
 

--