[commons-text] branch master updated: Throw an exception when an implicit narrowing conversion in a compound assignment would result in information loss or a numeric error such as an overflows.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git


The following commit(s) were added to refs/heads/master by this push:
     new a0533c0  Throw an exception when an implicit narrowing conversion in a 
compound assignment would result in information loss or a numeric error such as 
an overflows.
a0533c0 is described below

commit a0533c0dc70601dde2fa4db3111250cd2b299adc
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jan 30 15:35:48 2022 -0500

    Throw an exception when an implicit narrowing conversion in a compound
    assignment would result in information loss or a numeric error such as
    an overflows.
    
    - StrBuilder.StrBuilderReader.skip(long)
    - extStringBuilder.TextStringBuilderReader.skip(long)
---
 src/changes/changes.xml                                      | 2 ++
 src/main/java/org/apache/commons/text/StrBuilder.java        | 2 +-
 src/main/java/org/apache/commons/text/TextStringBuilder.java | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 69601cf..97fdb16 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -63,6 +63,8 @@ The <action> type attribute can be add,update,fix,remove.
     <action issue="TEXT-202" type="fix" dev="kinow" due-to="Arturo 
Bernal">Extract duplicate code.</action>
     <action issue="TEXT-205" type="fix" dev="kinow" due-to="Arturo Bernal">Set 
void return method.</action>
     <action                  type="fix" dev="ggregory" due-to="Gary 
Gregory">Remove unused exception from TextStringBuilder.readFrom(CharBuffer). 
This preserves binary compatibility but not source compatibility.</action>
+    <action                  type="fix" dev="ggregory" due-to="CodeQL, Gary 
Gregory">StrBuilder.StrBuilderReader.skip(long): Throw an exception when an 
implicit narrowing conversion in a compound assignment would result in 
information loss or a numeric error such as an overflows.</action>
+    <action                  type="fix" dev="ggregory" due-to="CodeQL, Gary 
Gregory">TextStringBuilder.TextStringBuilderReader.skip(long): Throw an 
exception when an implicit narrowing conversion in a compound assignment would 
result in information loss or a numeric error such as an overflows.</action>
     <!-- ADD -->
     <action issue="TEXT-207" type="add" dev="mattjuntunen">Add DoubleFormat 
utility.</action>
     <action issue="TEXT-190" type="add" dev="kinow" due-to="Benjamin 
Bing">Document negative limit for WordUtils abbreviate method</action>
diff --git a/src/main/java/org/apache/commons/text/StrBuilder.java 
b/src/main/java/org/apache/commons/text/StrBuilder.java
index d5e3aea..2ed8891 100644
--- a/src/main/java/org/apache/commons/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/text/StrBuilder.java
@@ -159,7 +159,7 @@ public class StrBuilder implements CharSequence, 
Appendable, Serializable, Build
             if (n < 0) {
                 return 0;
             }
-            pos += n;
+            pos = Math.addExact(pos, Math.toIntExact(n));
             return n;
         }
     }
diff --git a/src/main/java/org/apache/commons/text/TextStringBuilder.java 
b/src/main/java/org/apache/commons/text/TextStringBuilder.java
index aba3cca..cbf9b22 100644
--- a/src/main/java/org/apache/commons/text/TextStringBuilder.java
+++ b/src/main/java/org/apache/commons/text/TextStringBuilder.java
@@ -160,7 +160,7 @@ public class TextStringBuilder implements CharSequence, 
Appendable, Serializable
             if (n < 0) {
                 return 0;
             }
-            pos += n;
+            pos = Math.addExact(pos, Math.toIntExact(n));
             return n;
         }
     }