uint16_t index)
{
struct lttng_ust_elf_phdr *phdr = NULL;
- long offset;
+ off_t offset;
if (!elf) {
goto error;
goto error;
}
- offset = elf->ehdr->e_phoff + index * elf->ehdr->e_phentsize;
+ offset = (off_t) elf->ehdr->e_phoff
+ + (off_t) index * elf->ehdr->e_phentsize;
if (lseek(elf->fd, offset, SEEK_SET) < 0) {
goto error;
}
uint16_t index)
{
struct lttng_ust_elf_shdr *shdr = NULL;
- long offset;
+ off_t offset;
if (!elf) {
goto error;
goto error;
}
- offset = elf->ehdr->e_shoff + index * elf->ehdr->e_shentsize;
+ offset = (off_t) elf->ehdr->e_shoff
+ + (off_t) index * elf->ehdr->e_shentsize;
if (lseek(elf->fd, offset, SEEK_SET) < 0) {
goto error;
}
* If no name is found, NULL is returned.
*/
static
-char *lttng_ust_elf_get_section_name(struct lttng_ust_elf *elf, uint32_t offset)
+char *lttng_ust_elf_get_section_name(struct lttng_ust_elf *elf, off_t offset)
{
char *name = NULL;
size_t len = 0, to_read; /* len does not include \0 */
static
int lttng_ust_elf_get_build_id_from_segment(
struct lttng_ust_elf *elf, uint8_t **build_id, size_t *length,
- uint64_t offset, uint64_t segment_end, int *found)
+ off_t offset, off_t segment_end, int *found)
{
uint8_t *_build_id = NULL; /* Silence old gcc warning. */
size_t _length = 0; /* Silence old gcc warning. */
_length = nhdr.n_descsz;
_build_id = zmalloc(sizeof(uint8_t) * _length);
- if (!build_id) {
+ if (!_build_id) {
goto error;
}
*found = _found;
return 0;
error:
+ free(_build_id);
return -1;
}
size_t *length, int *found)
{
uint16_t i;
- uint8_t *_build_id;
- size_t _length;
+ uint8_t *_build_id = NULL; /* Silence old gcc warning. */
+ size_t _length = 0; /* Silence old gcc warning. */
int _found = 0;
if (!elf || !build_id || !length || !found) {
}
for (i = 0; i < elf->ehdr->e_phnum; ++i) {
- uint64_t offset, segment_end;
+ off_t offset, segment_end;
struct lttng_ust_elf_phdr *phdr;
int ret = 0;
struct lttng_ust_elf_shdr *shdr)
{
int _found = 0;
- char *_filename;
+ char *_filename = NULL; /* Silence old gcc warning. */
size_t filename_len;
char *section_name = NULL;
- uint32_t _crc;
+ uint32_t _crc = 0; /* Silence old gcc warning. */
if (!elf || !filename || !crc || !found || !shdr) {
goto error;
return 0;
error:
- if (section_name) {
- free(section_name);
- }
-
+ free(_filename);
+ free(section_name);
return -1;
}
int ret;
uint16_t i;
int _found = 0;
- char *_filename;
- uint32_t _crc;
+ char *_filename = NULL; /* Silence old gcc warning. */
+ uint32_t _crc = 0; /* Silence old gcc warning. */
if (!elf || !filename || !crc || !found) {
goto error;