From commits-return-52117-archive-asf-public=cust-asf.ponee.io@openoffice.apache.org Sun Apr 15 17:00:50 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 54EDD180648 for ; Sun, 15 Apr 2018 17:00:50 +0200 (CEST) Received: (qmail 47009 invoked by uid 500); 15 Apr 2018 15:00:49 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 46999 invoked by uid 99); 15 Apr 2018 15:00:49 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Apr 2018 15:00:49 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 7FBAA3A00AF for ; Sun, 15 Apr 2018 15:00:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1829211 - /openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Date: Sun, 15 Apr 2018 15:00:46 -0000 To: commits@openoffice.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180415150048.7FBAA3A00AF@svn01-us-west.apache.org> Author: damjan Date: Sun Apr 15 15:00:46 2018 New Revision: 1829211 URL: http://svn.apache.org/viewvc?rev=1829211&view=rev Log: Allow the Java version suffix (eg. the 162 in 1.8.0_162) to be 3 digits long. Patch by: me Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx?rev=1829211&r1=1829210&r2=1829211&view=diff ============================================================================== --- openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx (original) +++ openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Sun Apr 15 15:00:46 2018 @@ -144,8 +144,9 @@ bool SunVersion::init(const char *szVers if ( ! isdigit(*pCur)) { //1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 chars. + //1.7.0_161, 1.8.0_162, it's as long as 3 chars in later Java version. int len = pCur - pLast; - if (len > 2) + if (len > 3) return false; //we've got the update: 01, 02 etc strncpy(buf, pLast, len);