[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-5' - jvmfwk/plugins

[Caolán McNamara]

 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 16d60f0632ea16ac5ad8dae2a3781195fef50d9d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 22 08:22:47 2016 +0100

    Related: tdf#101057 allow java update version number > 99
    
    Change-Id: Icc37cf248fbf35f108eb5bbb25c36fbd54a9fe85
    (cherry picked from commit 64d3270a89fd88d4d0cf70329af2c66f722fd95e)
    Reviewed-on: https://gerrit.libreoffice.org/27426
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 4787440..b4ad701 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -135,9 +135,9 @@ bool SunVersion::init(const char *szVersion)
             {
                 if ( ! isdigit(*pCur))
                 {
-                    //1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 chars.
-                    int len = pCur - pLast;
-                    if (len > 2)
+                    //1.8.0_102-, 1.8.0_01a,
+                    size_t len = pCur - pLast;
+                    if (len > sizeof(buf) - 1)
                         return false;
                     //we've got the update: 01, 02 etc
                     strncpy(buf, pLast, len);