Fix #2684

radareorg · Jun 4, 2015 · 008158f · 008158f
1 parent 2acf7d4
commit 008158f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libr/bin/dwarf.c b/libr/bin/dwarf.c
@@ -462,7 +462,8 @@ static const ut8* r_bin_dwarf_parse_ext_opcode(const RBin *a, const ut8 *obuf,
 
  buf += (strlen (filename) + 1);
  ut64 dir_idx;
- buf = r_uleb128 (buf, ST32_MAX, &dir_idx);
+ if (buf+1 < buf_end)
+ buf = r_uleb128 (buf, ST32_MAX, &dir_idx);
  break;
  case DW_LNE_set_discriminator:
  buf = r_uleb128(buf, ST32_MAX, &addr);
@@ -1522,7 +1523,7 @@ R_API RList *r_bin_dwarf_parse_line(RBin *a, int mode) {
  if (len<1) {
  return NULL;
  }
- buf = calloc (1, len);
+ buf = calloc (1, len+1);
  ret = r_buf_read_at (binfile->buf, section->paddr, buf, len);
  if (!ret) {
  free (buf);