ipdbg: fix double free of virtual-ir data

[openocd.git] / src / helper / replacements.h

diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 1e2fbf20f9ef349484cd48dde2aefcc12aede0cd..6e30b628b07993927371053d47af17e3607c99b9 100644 (file)
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -7,24 +9,14 @@
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
  *   spen@spen-soft.co.uk                                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifndef OPENOCD_HELPER_REPLACEMENTS_H
 #define OPENOCD_HELPER_REPLACEMENTS_H
 
+#include <stdint.h>
+#include <helper/system.h>
+
 /* MIN,MAX macros */
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
@@ -74,12 +66,10 @@ int gettimeofday(struct timeval *tv, struct timezone *tz);
 
 #endif
 
-#ifndef IN_REPLACEMENTS_C
-/**** clear_malloc & fill_malloc ****/
 void *clear_malloc(size_t size);
 void *fill_malloc(size_t size);
-#endif
 
+#ifndef IN_REPLACEMENTS_C
 /*
  * Now you have 3 ways for the malloc function:
  *
@@ -108,6 +98,7 @@ void *fill_malloc(size_t size);
 
 /* #define malloc(_a) clear_malloc(_a)
  * #define malloc(_a) fill_malloc(_a) */
+#endif  /* IN_REPLACEMENTS_C */
 
 /* GNU extensions to the C library that may be missing on some systems */
 #ifndef HAVE_STRNDUP
@@ -199,6 +190,17 @@ static inline int close_socket(int sock)
 #endif
 }
 
+static inline void socket_block(int fd)
+{
+#ifdef _WIN32
+       unsigned long nonblock = 0;
+       ioctlsocket(fd, FIONBIO, &nonblock);
+#else
+       int oldopts = fcntl(fd, F_GETFL, 0);
+       fcntl(fd, F_SETFL, oldopts & ~O_NONBLOCK);
+#endif
+}
+
 static inline void socket_nonblock(int fd)
 {
 #ifdef _WIN32
@@ -228,13 +230,13 @@ static inline int socket_select(int max_fd,
 typedef uint32_t Elf32_Addr;
 typedef uint16_t Elf32_Half;
 typedef uint32_t Elf32_Off;
-typedef int32_t Elf32_Sword;
 typedef uint32_t Elf32_Word;
 typedef uint32_t Elf32_Size;
-typedef Elf32_Off Elf32_Hashelt;
+
+#define EI_NIDENT   16
 
 typedef struct {
-       unsigned char e_ident[16];      /* Magic number and other info */
+       unsigned char e_ident[EI_NIDENT];       /* Magic number and other info */
        Elf32_Half e_type;                      /* Object file type */
        Elf32_Half e_machine;                   /* Architecture */
        Elf32_Word e_version;                   /* Object file version */
@@ -276,8 +278,42 @@ typedef struct {
 
 #endif /* HAVE_ELF_H */
 
-#if defined HAVE_LIBUSB1 && !defined HAVE_LIBUSB_ERROR_NAME
-const char *libusb_error_name(int error_code);
-#endif /* defined HAVE_LIBUSB1 && !defined HAVE_LIBUSB_ERROR_NAME */
+#ifndef HAVE_ELF64
+
+typedef uint64_t Elf64_Addr;
+typedef uint16_t Elf64_Half;
+typedef uint64_t Elf64_Off;
+typedef uint32_t Elf64_Word;
+typedef uint64_t Elf64_Xword;
+
+typedef struct {
+       unsigned char e_ident[EI_NIDENT];       /* Magic number and other info */
+       Elf64_Half e_type;                      /* Object file type */
+       Elf64_Half e_machine;           /* Architecture */
+       Elf64_Word e_version;           /* Object file version */
+       Elf64_Addr e_entry;                     /* Entry point virtual address */
+       Elf64_Off e_phoff;                      /* Program header table file offset */
+       Elf64_Off e_shoff;                      /* Section header table file offset */
+       Elf64_Word e_flags;                     /* Processor-specific flags */
+       Elf64_Half e_ehsize;            /* ELF header size in bytes */
+       Elf64_Half e_phentsize;         /* Program header table entry size */
+       Elf64_Half e_phnum;                     /* Program header table entry count */
+       Elf64_Half e_shentsize;         /* Section header table entry size */
+       Elf64_Half e_shnum;                     /* Section header table entry count */
+       Elf64_Half e_shstrndx;          /* Section header string table index */
+} Elf64_Ehdr;
+
+typedef struct {
+       Elf64_Word p_type;              /* Segment type */
+       Elf64_Word p_flags;             /* Segment flags */
+       Elf64_Off p_offset;             /* Segment file offset */
+       Elf64_Addr p_vaddr;             /* Segment virtual address */
+       Elf64_Addr p_paddr;             /* Segment physical address */
+       Elf64_Xword p_filesz;   /* Segment size in file */
+       Elf64_Xword p_memsz;    /* Segment size in memory */
+       Elf64_Xword p_align;    /* Segment alignment */
+} Elf64_Phdr;
+
+#endif /* HAVE_ELF64 */
 
 #endif /* OPENOCD_HELPER_REPLACEMENTS_H */