From 16d60f0632ea16ac5ad8dae2a3781195fef50d9d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 22 Jul 2016 08:22:47 +0100 Subject: 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 Reviewed-by: Eike Rathke Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 47874405b731..b4ad7019d449 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); -- cgit