From commits-return-52834-archive-asf-public=cust-asf.ponee.io@openoffice.apache.org Wed Oct 31 14:39:32 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 0FC4A18065D for ; Wed, 31 Oct 2018 14:39:31 +0100 (CET) Received: (qmail 2748 invoked by uid 500); 31 Oct 2018 13:39:31 -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 2738 invoked by uid 99); 31 Oct 2018 13:39:31 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Oct 2018 13:39:31 +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 83BC63A028C for ; Wed, 31 Oct 2018 13:39:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1845330 - /openoffice/trunk/main/tools/source/string/strimp.cxx Date: Wed, 31 Oct 2018 13:39:30 -0000 To: commits@openoffice.apache.org From: mseidel@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181031133930.83BC63A028C@svn01-us-west.apache.org> Author: mseidel Date: Wed Oct 31 13:39:29 2018 New Revision: 1845330 URL: http://svn.apache.org/viewvc?rev=1845330&view=rev Log: Applying strimp.patch Modified: openoffice/trunk/main/tools/source/string/strimp.cxx Modified: openoffice/trunk/main/tools/source/string/strimp.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/source/string/strimp.cxx?rev=1845330&r1=1845329&r2=1845330&view=diff ============================================================================== --- openoffice/trunk/main/tools/source/string/strimp.cxx (original) +++ openoffice/trunk/main/tools/source/string/strimp.cxx Wed Oct 31 13:39:29 2018 @@ -1148,7 +1148,10 @@ STRING& STRING::ConvertLineEnd( LineEnd // Bei \r oder \n gibt es neuen Zeilenumbruch if ( (pStr[i] == _CR) || (pStr[i] == _LF) ) { - nLen = nLen + nLineEndLen; + if( nLen <= STRING_MAXLEN - nLineEndLen ) + nLen = nLen + nLineEndLen; + else + nLen = STRING_MAXLEN; // Wenn schon gesetzt, dann brauchen wir keine aufwendige Abfrage if ( !bConvert ) @@ -1169,7 +1172,10 @@ STRING& STRING::ConvertLineEnd( LineEnd ++i; } else - ++nLen; + { + if( nLen < STRING_MAXLEN ) + ++nLen; + } ++i; // Wenn String zu lang, dann konvertieren wir nicht