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

[pull] master from OSGeo:master #98

Merged
merged 2 commits into from
Nov 28, 2024
Merged

[pull] master from OSGeo:master #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6acebb7
vsisimple: explicitly allow NULL in VSIFree and VSIRealloc [ci skip]
lnicola Nov 28, 2024
02c5966
Merge pull request #11378 from lnicola/vsifree-null
rouault Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions port/cpl_vsisimple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,10 @@ static void VSICheckMarkerEnd(char *ptr, size_t nEnd)
/* VSIRealloc() */
/************************************************************************/

/** Analog of realloc(). Use VSIFree() to free */
/** Analog of realloc(). Use VSIFree() to free.
*
* If the pointer is NULL, VSIRealloc is equivalent to VSIMalloc.
*/
void *VSIRealloc(void *pData, size_t nNewSize)

{
Expand Down Expand Up @@ -824,7 +827,11 @@ void *VSIRealloc(void *pData, size_t nNewSize)
/************************************************************************/

/** Analog of free() for data allocated with VSIMalloc(), VSICalloc(),
* VSIRealloc() */
* VSIRealloc().
*
* It is not an error to call VSIFree with a NULL pointer, and it will
* have no effect.
*/
void VSIFree(void *pData)

{
Expand Down
Loading