fix off-by-one error (bug 1682)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9216 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b60ab4ff03cb3f56a7525275e5d30bf99d98fda..69d28446697b5bd82e2adcabaca955da5b07fc7f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-09  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lengthcommon.C (unitFromString): fix off-by-one error (bug 1682)
+
 2004-11-05  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * lyxfunc.C (dispatch): remove the verbose argument

diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index 89ff7e1a555a7101a3564995924286f43cea56aa..ffb01bc566402d21453defe06a992f506073d4ab 100644 (file)
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -61,7 +61,7 @@ char const * const unit_name_gui[] = {
 LyXLength::UNIT unitFromString(string const & data)
 {
        int i = 0;
-       while (i < num_units && data != unit_name[i])
+       while (i < num_units - 1 && data != unit_name[i])
                ++i;
        return static_cast<LyXLength::UNIT>(i);
 }