jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update pgmspace.h (#707)

Browse Source 
Fix redefines of strXXX, original was using strnXXX with length set to 0x7fffffff.  This caused problems with strcpy and strcat. The destination buffer was NULL'd to 0x7fffffff which killed the app.
This commit is contained in:
chuck todd 2017-10-08 21:38:42 -06:00 committed by Me No Dev
parent 8dc0c86457
commit 2f0cfa92cd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cores/esp32/pgmspace.h
View File

@ -29,8 +29,6 @@ typedef unsigned short prog_uint16_t;
typedef long prog_int32_t; typedef long prog_int32_t;
typedef unsigned long prog_uint32_t; typedef unsigned long prog_uint32_t;
#define SIZE_IRRELEVANT 0x7fffffff
#define PROGMEM #define PROGMEM
#define PGM_P const char * #define PGM_P const char *
#define PGM_VOID_P const void * #define PGM_VOID_P const void *
@ -56,10 +54,15 @@ typedef unsigned long prog_uint32_t;
#define memccpy_P memccpy #define memccpy_P memccpy
#define memmem_P memmem #define memmem_P memmem
#define memcpy_P memcpy #define memcpy_P memcpy
#define strcpy_P strcpy
#define strncpy_P strncpy #define strncpy_P strncpy
#define strcat_p strcat
#define strncat_P strncat #define strncat_P strncat
#define strcmp_P strcmp
#define strncmp_P strncmp #define strncmp_P strncmp
#define strcasecmp_P strcasecmp
#define strncasecmp_P strncasecmp #define strncasecmp_P strncasecmp
#define strlen_P strlen
#define strnlen_P strnlen #define strnlen_P strnlen
#define strstr_P strstr #define strstr_P strstr
#define printf_P printf #define printf_P printf
@ -67,10 +70,4 @@ typedef unsigned long prog_uint32_t;
#define snprintf_P snprintf #define snprintf_P snprintf
#define vsnprintf_P vsnprintf #define vsnprintf_P vsnprintf
#define strlen_P(strP) strnlen_P((strP), SIZE_IRRELEVANT)
#define strcasecmp_P(str1, str2P) strncasecmp_P((str1), (str2P), SIZE_IRRELEVANT)
#define strcmp_P(str1, str2P) strncmp_P((str1), (str2P), SIZE_IRRELEVANT)
#define strcat_P(dest, src) strncat_P((dest), (src), SIZE_IRRELEVANT)
#define strcpy_P(dest, src) strncpy_P((dest), (src), SIZE_IRRELEVANT)
#endif #endif