tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r708125 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/xmlparser/ASCIIReader.java webapps/docs/changelog.xml
Date Mon, 27 Oct 2008 10:10:13 GMT
Author: markt
Date: Mon Oct 27 03:10:13 2008
New Revision: 708125

URL: http://svn.apache.org/viewvc?rev=708125&view=rev
Log:
Fix signed/unsigned conversion reported by Find Bugs

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708125&r1=708124&r2=708125&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 03:10:13 2008
@@ -151,11 +151,6 @@
   +1: markt,fhanik
   -1: 
 
-* Fix ASCII parsing bug found by Find Bugs
-  http://svn.apache.org/viewvc?rev=699644&view=rev
-  +1: markt, remm,fhanik
-  -1: 
-
 * Fix casting bug found by Find Bugs
   http://svn.apache.org/viewvc?rev=699645&view=rev
   +1: markt, remm,fhanik

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java?rev=708125&r1=708124&r2=708125&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java Mon Oct 27 03:10:13
2008
@@ -112,7 +112,7 @@
         }
         int count = fInputStream.read(fBuffer, 0, length);
         for (int i = 0; i < count; i++) {
-            int b0 = fBuffer[i];
+            int b0 = (0xff & fBuffer[i]); // Convert to unsigned
             if (b0 > 0x80) {
                 throw new IOException(Localizer.getMessage("jsp.error.xml.invalidASCII",
 							   Integer.toString(b0)));

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708125&r1=708124&r2=708125&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 03:10:13 2008
@@ -163,6 +163,9 @@
         <bug>45691</bug>: Prevent generation of duplicate variable names when
         generating code for JSPs. (markt)
       </fix>
+      <fix>
+        Correct signed/unsigned conversion error in ASCII parsing. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message