diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2015-11-05 19:41:57 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2015-11-06 21:51:19 +0100 |
| commit | bb15aa8bfd1b272d3b4a54e7a23a960691f98884 (patch) | |
| tree | 350926214ae0fbe2e4c2eca5717565a423a6205e | |
| parent | b95ad23cfe9d72fb96104e1be705df217f867ad7 (diff) | |
fix crash output
| -rw-r--r-- | vm/kvm/kvm.go | 7 | ||||
| -rw-r--r-- | vm/qemu/qemu.go | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/vm/kvm/kvm.go b/vm/kvm/kvm.go index 97b72e7fa..2b76c9b13 100644 --- a/vm/kvm/kvm.go +++ b/vm/kvm/kvm.go @@ -254,8 +254,11 @@ func (inst *Instance) Run() { outputMu.Unlock() time.Sleep(5 * time.Second) outputMu.Lock() - output = output[matchPos:] - loc = crashRe.FindAllIndex(output, -1) + loc = crashRe.FindAllIndex(output[matchPos:], -1) + for i := range loc { + loc[i][0] += matchPos + loc[i][1] += matchPos + } start := loc[0][0] - contextSize if start < 0 { start = 0 diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go index e6252adb1..ad868eaac 100644 --- a/vm/qemu/qemu.go +++ b/vm/qemu/qemu.go @@ -291,8 +291,11 @@ func (inst *Instance) Run() { outputMu.Unlock() time.Sleep(5 * time.Second) outputMu.Lock() - output = output[matchPos:] - loc = crashRe.FindAllIndex(output, -1) + loc = crashRe.FindAllIndex(output[matchPos:], -1) + for i := range loc { + loc[i][0] += matchPos + loc[i][1] += matchPos + } start := loc[0][0] - contextSize if start < 0 { start = 0 |