Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GRIB: fix thread-safetey of errSprintf() #4830

Merged
merged 2 commits into from
Nov 16, 2021
Merged

GRIB: fix thread-safetey of errSprintf() #4830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1062541
GRIB: fix thread-safetey of errSprintf()
rouault Nov 15, 2021
5a354a4
Update frmts/grib/degrib/degrib/myerror.cpp
rouault Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion frmts/grib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ add_gdal_driver(
degrib/degrib/degrib2.cpp
degrib/degrib/inventory.cpp
degrib/degrib/metaname.cpp
degrib/degrib/myerror.c
degrib/degrib/myerror.cpp
degrib/degrib/grib1tab.cpp
degrib/degrib/myutil.c
degrib/degrib/metaparse.cpp
Expand Down
43 changes: 28 additions & 15 deletions frmts/grib/degrib/degrib/myerror.c → frmts/grib/degrib/degrib/myerror.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@
#include "memwatch.h"
#endif

#if __cplusplus >= 201500
# define CPL_FALLTHROUGH [[fallthrough]];
#elif ((defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >=7))) || __GNUC__ >= 7)
/** Macro for fallthrough in a switch case construct */
# define CPL_FALLTHROUGH [[clang::fallthrough]];
#else
/** Macro for fallthrough in a switch case construct */
# define CPL_FALLTHROUGH
#endif



/*****************************************************************************
* AllocSprintf() -- Arthur Taylor / MDL (Review 12/2002)
*
Expand Down Expand Up @@ -99,7 +111,7 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,

myAssert (sizeof (char) == 1);

if ((fmt == NULL) || (strlen (fmt) == 0)) {
if ((fmt == nullptr) || (strlen (fmt) == 0)) {
return;
}
p = fmt;
Expand All @@ -120,7 +132,7 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,
p1 = p;
p = strchr (p1, '%');
/* Handle simple case when no more % in format string. */
if (p == NULL) {
if (p == nullptr) {
/* No more format strings; copy rest of format and return */
lenBuff += strlen (p1);
buffer = (char *) realloc ((void *) buffer, lenBuff);
Expand Down Expand Up @@ -231,7 +243,7 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,
ipos = lenBuff - 1;
break;
}
/* Intentionally fall through. */
CPL_FALLTHROUGH
case 'S':
if ((p1 - p) == 1) {
f_inLoop = 0;
Expand All @@ -251,12 +263,13 @@ static void AllocSprintf (char **Ptr, size_t *LenBuff, const char *fmt,
}
break;
}
/* Intentionally fall through. */
CPL_FALLTHROUGH
default:
lenBuff += p1 - p;
buffer = (char *) realloc ((void *) buffer, lenBuff);
strncpy (buffer + ipos, p + 1, p1 - p);
ipos = lenBuff - 1;
break;
}
}
p = p1 + 1;
Expand Down Expand Up @@ -295,8 +308,8 @@ void mallocSprintf (char **Ptr, const char *fmt, ...)
va_list ap; /* Contains the data needed by fmt. */
size_t buff_len = 0; /* Allocated length of buffer. */

*Ptr = NULL;
if (fmt != NULL) {
*Ptr = nullptr;
if (fmt != nullptr) {
va_start (ap, fmt); /* make ap point to 1st unnamed arg. */
AllocSprintf (Ptr, &buff_len, fmt, ap);
va_end (ap); /* clean up when done. */
Expand Down Expand Up @@ -333,9 +346,9 @@ void reallocSprintf (char **Ptr, const char *fmt, ...)
va_list ap; /* Contains the data needed by fmt. */
size_t buff_len; /* Allocated length of buffer. */

if (fmt != NULL) {
if (fmt != nullptr) {
va_start (ap, fmt); /* make ap point to 1st unnamed arg. */
if (*Ptr == NULL) {
if (*Ptr == nullptr) {
buff_len = 0;
} else {
buff_len = strlen (*Ptr) + 1;
Expand Down Expand Up @@ -374,25 +387,25 @@ void reallocSprintf (char **Ptr, const char *fmt, ...)
*****************************************************************************
*/
/* Following 2 variables used in both errSprintf and preErrSprintf */
static char *errBuffer = NULL; /* Stores the current built up message. */
static size_t errBuff_len = 0; /* Allocated length of errBuffer. */
static thread_local char *errBuffer = nullptr; /* Stores the current built up message. */
static thread_local size_t errBuff_len = 0; /* Allocated length of errBuffer. */

char *errSprintf (const char *fmt, ...)
{
va_list ap; /* Contains the data needed by fmt. */
char *ans; /* Pointer to the final message while we reset
* buffer. */

if (fmt == NULL) {
if (fmt == nullptr) {
ans = errBuffer;
errBuffer = NULL;
errBuffer = nullptr;
errBuff_len = 0;
return ans;
}
va_start (ap, fmt); /* make ap point to 1st unnamed arg. */
AllocSprintf (&errBuffer, &errBuff_len, fmt, ap);
va_end (ap); /* clean up when done. */
return NULL;
return nullptr;
}

/*****************************************************************************
Expand Down Expand Up @@ -423,13 +436,13 @@ char *errSprintf (const char *fmt, ...)
*/
void preErrSprintf (const char *fmt, ...)
{
char *preBuffer = NULL; /* Stores the prepended message. */
char *preBuffer = nullptr; /* Stores the prepended message. */
size_t preBuff_len = 0; /* Allocated length of preBuffer. */
va_list ap; /* Contains the data needed by fmt. */

myAssert (sizeof (char) == 1);

if (fmt == NULL) {
if (fmt == nullptr) {
return;
}
va_start (ap, fmt); /* make ap point to 1st unnamed arg. */
Expand Down