You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2019/03/15 19:51:31 UTC
[hbase] branch branch-2.2 updated: HBASE-22032 KeyValue validation
should check for null byte array
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new ad12bbc HBASE-22032 KeyValue validation should check for null byte array
ad12bbc is described below
commit ad12bbc4a97f4fda748f830d035a7bdea98b5d47
Author: Geoffrey Jacoby <gj...@apache.org>
AuthorDate: Mon Mar 11 14:08:49 2019 -0700
HBASE-22032 KeyValue validation should check for null byte array
Signed-off-by: Andrew Purtell <ap...@apache.org>
Conflicts:
hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
---
.../java/org/apache/hadoop/hbase/KeyValueUtil.java | 8 ++++-
.../java/org/apache/hadoop/hbase/TestKeyValue.java | 35 +++++++++++++++-------
2 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java
index 581c6bb..0a6d63a 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueUtil.java
@@ -509,11 +509,17 @@ public class KeyValueUtil {
}
static String bytesToHex(byte[] buf, int offset, int length) {
- return ", KeyValueBytesHex=" + Bytes.toStringBinary(buf, offset, length) + ", offset=" + offset
+ String bufferContents = buf != null ? Bytes.toStringBinary(buf, offset, length) : "<null>";
+ return ", KeyValueBytesHex=" + bufferContents + ", offset=" + offset
+ ", length=" + length;
}
static void checkKeyValueBytes(byte[] buf, int offset, int length, boolean withTags) {
+ if (buf == null) {
+ throw new IllegalArgumentException("Invalid to have null " +
+ "byte array in KeyValue.");
+ }
+
int pos = offset, endOffset = offset + length;
// check the key
if (pos + Bytes.SIZEOF_INT > endOffset) {
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
index f0a8b65..b867c16 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -624,6 +625,20 @@ public class TestKeyValue {
}
}
+ @Test
+ public void testNullByteArrayKeyValueFailure() {
+ //can't add to testCheckKeyValueBytesFailureCase because it
+ //goes through the InputStream KeyValue API which can't produce a null buffer
+ try {
+ KeyValue kv = new KeyValue(null, 0, 0);
+ } catch (IllegalArgumentException iae){
+ assertEquals("Invalid to have null byte array in KeyValue.", iae.getMessage());
+ return;
+ }
+ fail("Should have thrown an IllegalArgumentException when " +
+ "creating a KeyValue with a null buffer");
+ }
+
private static class FailureCase {
byte[] buf;
int offset;
@@ -673,16 +688,16 @@ public class TestKeyValue {
+ "\\x00\\x00\\x00\\x00\\x00\\x00\\x01\\x04VALUE"), // case.12
};
String[] outputs = new String[] { "Overflow when reading key length at position=0",
- "Overflow when reading key length at position=0",
- "Invalid key length in KeyValue. keyLength=1",
- "Overflow when reading value length at position=4",
- "Invalid value length in KeyValue, valueLength=1",
- "Overflow when reading row length at position=8",
- "Invalid row length in KeyValue, rowLength=1",
- "Overflow when reading family length at position=13",
- "Invalid family length in KeyValue, familyLength=1", "Timestamp cannot be negative, ts=-1",
- "Invalid type in KeyValue, type=3", "Overflow when reading value part at position=25",
- "Invalid tags length in KeyValue at position=26", };
+ "Overflow when reading key length at position=0",
+ "Invalid key length in KeyValue. keyLength=1",
+ "Overflow when reading value length at position=4",
+ "Invalid value length in KeyValue, valueLength=1",
+ "Overflow when reading row length at position=8",
+ "Invalid row length in KeyValue, rowLength=1",
+ "Overflow when reading family length at position=13",
+ "Invalid family length in KeyValue, familyLength=1", "Timestamp cannot be negative, ts=-1",
+ "Invalid type in KeyValue, type=3", "Overflow when reading value part at position=25",
+ "Invalid tags length in KeyValue at position=26"};
byte[][] withTagsInputs = new byte[][] {
Bytes.toBytesBinary("\\x00\\x00\\x00\\x11\\x00\\x00\\x00\\x01\\x00\\x03ROW\\x01FQ\\x00"
+ "\\x00\\x00\\x00\\x00\\x00\\x00\\x01\\x04V\\x01"), // case.13