DBFReader: row.getString() does not return null for NULL MEMO field

Fix #121
albfernandez · Feb 29, 2024 · a53db3a · a53db3a
1 parent 9661e20
commit a53db3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/com/linuxense/javadbf/DBFMemoFile.java b/src/main/java/com/linuxense/javadbf/DBFMemoFile.java
@@ -143,6 +143,9 @@ protected byte[] readBinary(int block) {
 	}
 
 	protected Object readData(int block, DBFDataType type) {
+		if (block <= 0) {
+			return null;
+		}
 		long blockStart = this.blockSize * (long) block;
 		DBFDataType usedType = null;
 		try {

diff --git a/src/main/java/com/linuxense/javadbf/DBFReader.java b/src/main/java/com/linuxense/javadbf/DBFReader.java
@@ -556,7 +556,7 @@ private Object readMemoField(DBFField field) throws IOException {
 		else {
 			nBlock = DBFUtils.readLittleEndianInt(this.dataInputStream);
 		}
-		if (this.memoFile != null && nBlock != null) {
+		if (this.memoFile != null && nBlock != null && nBlock.intValue() > 0) {
 			DBFDataType type = field.getType();
 			if (type == DBFDataType.MEMO && fieldsAsBinary.contains(field.getName().toUpperCase())) {
 				type = DBFDataType.BINARY;