[bug-64473] OPCPackage.open(fileName, PackageAccess.READ) does not open valid xlsx file. Thanks to Yury Molchan.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1891692 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-07-20 17:00:32 +00:00
parent c0c39ed779
commit cb6e6e0609
3 changed files with 46 additions and 1 deletions

View File

@ -65,7 +65,7 @@ public final class PackagePartCollection implements Serializable {
final String ppName = partName.getName(); final String ppName = partName.getName();
final StringBuilder concatSeg = new StringBuilder(); final StringBuilder concatSeg = new StringBuilder();
// split at slash, but keep leading slash // split at slash, but keep leading slash
final String delim = "(?=["+PackagingURIHelper.FORWARD_SLASH_STRING+".])"; final String delim = "(?=["+PackagingURIHelper.FORWARD_SLASH_STRING+"])";
for (String seg : ppName.split(delim)) { for (String seg : ppName.split(delim)) {
concatSeg.append(seg); concatSeg.append(seg);
if (registerPartNameStr.contains(concatSeg.toString())) { if (registerPartNameStr.contains(concatSeg.toString())) {

View File

@ -0,0 +1,45 @@
/* ====================================================================
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.poi.openxml4j.opc;
import static org.apache.poi.openxml4j.OpenXML4JTestDataSamples.openSampleStream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
import java.util.List;
import java.util.regex.Pattern;
import org.junit.jupiter.api.Test;
public class TestPackagePartCollection {
@Test
void testPackagePartCollection_64473() throws Exception {
InputStream is = openSampleStream("64473.xlsx");
try (OPCPackage pkg = OPCPackage.open(is)) {
List<PackagePart> allParts = pkg.getParts();
assertEquals(15, allParts.size());
List<PackagePart> partsByName = pkg.getPartsByName(Pattern.compile("/xl/metadata.*"));
// contains the following parts:
// /xl/metadata
// /xl/metadata.xml
assertEquals(2, partsByName.size());
}
}
}

Binary file not shown.