[NAN] TLV utilities iterator - throw correct exception

Make sure that iterator.next() validates that next element exists -
otherwise throw the exception specified by the interface.

Bug: 30096512
Change-Id: I327da433e3f1181e272c81ee503cbe8aab323f7e
This commit is contained in:
Etan Cohen
2016-07-18 10:37:20 -07:00
parent 0a5b7efcb2
commit 3e5ac12302

View File

@@ -24,6 +24,7 @@ import java.nio.BufferOverflowException;
import java.nio.ByteOrder;
import java.util.Arrays;
import java.util.Iterator;
import java.util.NoSuchElementException;
/**
* Utility class to construct and parse byte arrays using the TLV format -
@@ -464,6 +465,10 @@ public class TlvBufferUtils {
@Override
public TlvElement next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
int type = 0;
if (mTypeSize == 1) {
type = mArray[mOffset];