# HG changeset patch # User Doug Simon # Date 1382003187 -7200 # Node ID b7fd9efe24c58eed14d152c70c1069f5819db780 # Parent b11213c417692b1a2a13ef35b3185e5101622f50 prevent npe in Buffer.copyData() when Buffer.data is null diff -r b11213c41769 -r b7fd9efe24c5 graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Buffer.java --- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Buffer.java Thu Oct 17 10:52:56 2013 +0200 +++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Buffer.java Thu Oct 17 11:46:27 2013 +0200 @@ -56,10 +56,14 @@ public byte[] close(boolean trimmedCopy) { byte[] result = trimmedCopy ? Arrays.copyOf(data, position()) : data; data = null; + position = 0; return result; } public byte[] copyData(int start, int end) { + if (data == null) { + return null; + } return Arrays.copyOfRange(data, start, end); }