summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-22 08:22:47 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-26 09:22:50 +0000
commit16d60f0632ea16ac5ad8dae2a3781195fef50d9d (patch)
tree56cd6141ca6cbfc9a25166d779b1074759ca798f
parentce43440dd910c2ff27e95db3009752cfb2b608e3 (diff)
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@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx6
1 files 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);