zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复FileMagicNumber长度判断问题导致的越界异常

Browse Source
This commit is contained in:
Looly
2023-03-12 15:58:45 +08:00
parent a3f48ccb29
commit c6ce5fe215
4 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java
View File

@@ -19,38 +19,38 @@ public class FileTypeUtilTest {
@Test
@Ignore
public void fileTypeUtilTest() {
File file = FileUtil.file("hutool.jpg");
String type = FileTypeUtil.getType(file);
final File file = FileUtil.file("hutool.jpg");
final String type = FileTypeUtil.getType(file);
Assert.assertEquals("jpg", type);
FileTypeUtil.putFileType("ffd8ffe000104a464946", "new_jpg");
String newType = FileTypeUtil.getType(file);
final String newType = FileTypeUtil.getType(file);
Assert.assertEquals("new_jpg", newType);
}
@Test
@Ignore
public void emptyTest() {
File file = FileUtil.file("d:/empty.txt");
String type = FileTypeUtil.getType(file);
final File file = FileUtil.file("d:/empty.txt");
final String type = FileTypeUtil.getType(file);
Console.log(type);
}
@Test
@Ignore
public void docTest() {
File file = FileUtil.file("f:/test/test.doc");
String type = FileTypeUtil.getType(file);
final File file = FileUtil.file("f:/test/test.doc");
final String type = FileTypeUtil.getType(file);
Console.log(type);
}
@Test
@Ignore
public void ofdTest() {
File file = FileUtil.file("e:/test.ofd");
String hex = IoUtil.readHex64Upper(FileUtil.getInputStream(file));
final File file = FileUtil.file("e:/test.ofd");
final String hex = IoUtil.readHex64Upper(FileUtil.getInputStream(file));
Console.log(hex);
String type = FileTypeUtil.getType(file);
final String type = FileTypeUtil.getType(file);
Console.log(type);
Assert.assertEquals("ofd", type);
}
@@ -59,18 +59,18 @@ public class FileTypeUtilTest {
@Test
@Ignore
public void inputStreamAndFilenameTest() {
File file = FileUtil.file("e:/laboratory/test.xlsx");
String type = FileTypeUtil.getType(file);
final File file = FileUtil.file("e:/laboratory/test.xlsx");
final String type = FileTypeUtil.getType(file);
Assert.assertEquals("xlsx", type);
}
@Test
@Ignore
public void getTypeFromInputStream() throws IOException {
File file = FileUtil.file("d:/test/pic.jpg");
final File file = FileUtil.file("d:/test/pic.jpg");
final BufferedInputStream inputStream = FileUtil.getInputStream(file);
inputStream.mark(0);
String type = FileTypeUtil.getType(inputStream);
final String type = FileTypeUtil.getType(inputStream);
inputStream.reset();
}
@@ -85,4 +85,11 @@ public class FileTypeUtilTest {
Console.log(type);
}
@Test
public void issueI6MACITest() {
final File file = FileUtil.file("text.txt");
final String type = FileTypeUtil.getType(file);
Assert.assertEquals("txt", type);
}
}

1
hutool-core/src/test/resources/text.txt Normal file
View File

@@ -0,0 +1 @@
1