[libreoffice] 03/06: jre-update-gt-99.diff is not upstream in 5.2.0
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 360d16359909fe933a827d1112fbe559e0dfe072
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 30 11:23:07 2016 +0200
jre-update-gt-99.diff is not upstream in 5.2.0
---
patches/jre-update-gt-99.diff | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/patches/jre-update-gt-99.diff b/patches/jre-update-gt-99.diff
new file mode 100644
index 0000000..e92cd7e
--- /dev/null
+++ b/patches/jre-update-gt-99.diff
@@ -0,0 +1,31 @@
+From 191e3809f5d62392bf98b940ad8f6937ae5ee6c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+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/27425
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+
+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);
+--
+cgit v0.10.2
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: