From d309b21d2ee150a9f426c7d22a5ce6d392b59d26 Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Fri, 17 Nov 2006 18:09:59 -0800 Subject: [PATCH] have cstring() return null if passed a null pointer darcs-hash:20061118020959-0c629-68cc6e9336b7c981bc3ddd49ffc43978f39163c6.gz --- src/org/ibex/nestedvm/Runtime.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/ibex/nestedvm/Runtime.java b/src/org/ibex/nestedvm/Runtime.java index 4618dc3..5c2cc6a 100644 --- a/src/org/ibex/nestedvm/Runtime.java +++ b/src/org/ibex/nestedvm/Runtime.java @@ -1252,6 +1252,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable { /** Helper function to read a cstring from main memory */ public final String cstring(int addr) throws ReadFaultException { + if (addr == 0) return null; StringBuffer sb = new StringBuffer(); for(;;) { int word = memRead(addr&~3); -- 1.7.10.4