diff options
| author | Roland McGrath <roland@redhat.com> | 2010-05-20 17:04:15 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2010-05-20 17:04:15 -0700 |
| commit | 844f20f64770e9ed4177aa7285c9b96a11ec7547 (patch) | |
| tree | 38c73449e465eade3d36f891b9c5db2bee0e4c3b /libelf/note_xlate.h | |
| parent | fb65cc365e5d51f2434128467dab554f6921727b (diff) | |
| parent | a0635db0fbe13ad7b531ee99eeb063a8eded923c (diff) | |
| download | elfutils-844f20f64770e9ed4177aa7285c9b96a11ec7547.tar.gz | |
Merge branch 'master' into roland/notes
Conflicts:
libdw/libdw.map
libdwfl/Makefile.am
libdwfl/argp-std.c
libdwfl/core-file.c
libdwfl/libdwfl.h
libdwfl/libdwflP.h
libdwfl/linux-proc-maps.c
libelf/Makefile.am
libelf/common.h
libelf/elf_begin.c
libelf/elf_readall.c
libelf/libelf.map
libelf/libelfP.h
tests/Makefile.am
Diffstat (limited to 'libelf/note_xlate.h')
| -rw-r--r-- | libelf/note_xlate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libelf/note_xlate.h b/libelf/note_xlate.h index 6e8b78c6..a72fe868 100644 --- a/libelf/note_xlate.h +++ b/libelf/note_xlate.h @@ -1,5 +1,5 @@ /* Conversion functions for notes. - Copyright (C) 2007 Red Hat, Inc. + Copyright (C) 2007, 2009 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ elf_cvt_note (void *dest, const void *src, size_t len, int encode) { assert (sizeof (Elf32_Nhdr) == sizeof (Elf64_Nhdr)); - while (len > 0) + while (len >= sizeof (Elf32_Nhdr)) { (1 ? Elf32_cvt_Nhdr : Elf64_cvt_Nhdr) (dest, src, sizeof (Elf32_Nhdr), encode); |