Draczech commented on code in PR #368: URL: https://github.com/apache/commons-imaging/pull/368#discussion_r1505992407
########## src/test/java/org/apache/commons/imaging/formats/ico/IcoImageParserTest.java: ########## @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.imaging.formats.ico; + +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.apache.commons.imaging.ImagingException; +import org.apache.commons.imaging.test.TestResources; +import org.junit.jupiter.api.Test; + +import java.io.File; + +public class IcoImageParserTest { + + /** + * For https://issues.apache.org/jira/browse/IMAGING-373. + * <p> There is a problem with loading bitmap stored in given ICO file, so the exception is originally thrown by BmpImageParser. Review Comment: Fixed. I haven't noticed any plugin like https://github.com/diffplug/spotless in the project, I might just missed it. Apparently I'm relying too much on such tools :) ########## src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java: ########## @@ -569,7 +569,7 @@ private BmpImageContents readImageContents(final InputStream is, final FormatCom debugNumber("expectedDataOffset", expectedDataOffset, 4); } final int extraBytes = bhi.bitmapDataOffset - expectedDataOffset; - if (extraBytes < 0) { + if ((extraBytes < 0) || (extraBytes > bhi.fileSize)) { Review Comment: Fixed -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
