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

dbfopen: fix possible memory leaks when using realloc #166

Closed
wants to merge 2 commits into from
Closed

dbfopen: fix possible memory leaks when using realloc #166

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97b5b6a
dbfopen: fix possible memory leaks when using realloc
ymdatta Oct 29, 2024
3299315
Update dbfopen.c
ymdatta Nov 1, 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
155 changes: 131 additions & 24 deletions dbfopen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "shapefil_private.h"

#include <math.h>
#include <assert.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -459,9 +460,19 @@ DBFHandle SHPAPI_CALL DBFOpenLL(const char *pszFilename, const char *pszAccess,
/* -------------------------------------------------------------------- */
/* Read in Field Definitions */
/* -------------------------------------------------------------------- */
pabyBuf = STATIC_CAST(unsigned char *, realloc(pabyBuf, nHeadLen));
psDBF->pszHeader = REINTERPRET_CAST(char *, pabyBuf);
unsigned char *pabyBuf_realloc_ptr =
STATIC_CAST(unsigned char *, realloc(pabyBuf, nHeadLen));
if (!pabyBuf_realloc_ptr)
{
psDBF->nFields--;
return SHPLIB_NULLPTR;
}
else
{
pabyBuf = pabyBuf_realloc_ptr;
}

psDBF->pszHeader = REINTERPRET_CAST(char *, pabyBuf);
psDBF->sHooks.FSeek(psDBF->fp, XBASE_FILEHDR_SZ, 0);
if (psDBF->sHooks.FRead(pabyBuf, nHeadLen - XBASE_FILEHDR_SZ, 1,
psDBF->fp) != 1)
Expand Down Expand Up @@ -799,25 +810,67 @@ int SHPAPI_CALL DBFAddNativeFieldType(DBFHandle psDBF, const char *pszFieldName,

const int nOldRecordLength = psDBF->nRecordLength;
const int nOldHeaderLength = psDBF->nHeaderLength;
int *psDBF_realloc_ptr = NULL;
char *psDBF_char_realloc_ptr = NULL;

/* -------------------------------------------------------------------- */
/* realloc all the arrays larger to hold the additional field */
/* information. */
/* -------------------------------------------------------------------- */
psDBF->nFields++;

psDBF->panFieldOffset = STATIC_CAST(
psDBF_realloc_ptr = STATIC_CAST(
int *, realloc(psDBF->panFieldOffset, sizeof(int) * psDBF->nFields));

psDBF->panFieldSize = STATIC_CAST(
if (!psDBF_realloc_ptr)
{
psDBF->nFields--;
return -1;
}
else
{
psDBF->panFieldOffset = psDBF_realloc_ptr;
}

psDBF_realloc_ptr = STATIC_CAST(
int *, realloc(psDBF->panFieldSize, sizeof(int) * psDBF->nFields));

psDBF->panFieldDecimals = STATIC_CAST(
if (!psDBF_realloc_ptr)
{
psDBF->nFields--;
return -1;
}
else
{
psDBF->panFieldSize = psDBF_realloc_ptr;
}

psDBF_realloc_ptr = STATIC_CAST(
int *, realloc(psDBF->panFieldDecimals, sizeof(int) * psDBF->nFields));

psDBF->pachFieldType = STATIC_CAST(
if (!psDBF_realloc_ptr)
{
psDBF->nFields--;
return -1;
}
else
{
psDBF->panFieldDecimals = psDBF_realloc_ptr;
}

psDBF_char_realloc_ptr = STATIC_CAST(
char *, realloc(psDBF->pachFieldType, sizeof(char) * psDBF->nFields));

if (!psDBF_char_realloc_ptr)
{
psDBF->nFields--;
return -1;
}
else
{
psDBF->pachFieldType = psDBF_char_realloc_ptr;
}

/* -------------------------------------------------------------------- */
/* Assign the new field information fields. */
/* -------------------------------------------------------------------- */
Expand All @@ -833,9 +886,20 @@ int SHPAPI_CALL DBFAddNativeFieldType(DBFHandle psDBF, const char *pszFieldName,
psDBF->nHeaderLength += XBASE_FLDHDR_SZ;
psDBF->bUpdated = FALSE;

psDBF->pszHeader = STATIC_CAST(
psDBF_char_realloc_ptr = STATIC_CAST(
char *, realloc(psDBF->pszHeader, psDBF->nFields * XBASE_FLDHDR_SZ));

if (!psDBF_char_realloc_ptr)
{
psDBF->nFields--;
ymdatta marked this conversation as resolved.
Show resolved Hide resolved
psDBF->nHeaderLength -= XBASE_FLDHDR_SZ;
return -1;
}
else
{
psDBF->pszHeader = psDBF_char_realloc_ptr;
}

char *pszFInfo = psDBF->pszHeader + XBASE_FLDHDR_SZ * (psDBF->nFields - 1);

for (int i = 0; i < XBASE_FLDHDR_SZ; i++)
Expand All @@ -859,9 +923,20 @@ int SHPAPI_CALL DBFAddNativeFieldType(DBFHandle psDBF, const char *pszFieldName,
/* -------------------------------------------------------------------- */
/* Make the current record buffer appropriately larger. */
/* -------------------------------------------------------------------- */
psDBF->pszCurrentRecord = STATIC_CAST(
psDBF_char_realloc_ptr = STATIC_CAST(
char *, realloc(psDBF->pszCurrentRecord, psDBF->nRecordLength));

if (!psDBF_char_realloc_ptr)
{
psDBF->nFields--;
psDBF->nHeaderLength -= XBASE_FLDHDR_SZ;
return -1;
}
else
{
psDBF->pszCurrentRecord = psDBF_char_realloc_ptr;
}

/* we're done if dealing with new .dbf */
if (psDBF->bNoHeader)
return (psDBF->nFields - 1);
Expand Down Expand Up @@ -964,8 +1039,19 @@ static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField,
psDBF->pszWorkField =
STATIC_CAST(char *, malloc(psDBF->nWorkFieldLength));
else
psDBF->pszWorkField = STATIC_CAST(
{
char *psDBF_char_realloc_ptr = STATIC_CAST(
char *, realloc(psDBF->pszWorkField, psDBF->nWorkFieldLength));

if (!psDBF_char_realloc_ptr)
{
return SHPLIB_NULLPTR;
}
else
{
psDBF->pszWorkField = psDBF_char_realloc_ptr;
}
}
}

/* -------------------------------------------------------------------- */
Expand Down Expand Up @@ -1828,6 +1914,8 @@ int SHPAPI_CALL DBFDeleteField(DBFHandle psDBF, int iField)
int nOldHeaderLength = psDBF->nHeaderLength;
int nDeletedFieldOffset = psDBF->panFieldOffset[iField];
int nDeletedFieldSize = psDBF->panFieldSize[iField];
int *psDBF_realloc_ptr = NULL;
char *psDBF_char_realloc_ptr = NULL;

/* update fields info */
for (int i = iField + 1; i < psDBF->nFields; i++)
Expand All @@ -1842,18 +1930,6 @@ int SHPAPI_CALL DBFDeleteField(DBFHandle psDBF, int iField)
/* resize fields arrays */
psDBF->nFields--;

psDBF->panFieldOffset = STATIC_CAST(
int *, realloc(psDBF->panFieldOffset, sizeof(int) * psDBF->nFields));

psDBF->panFieldSize = STATIC_CAST(
int *, realloc(psDBF->panFieldSize, sizeof(int) * psDBF->nFields));

psDBF->panFieldDecimals = STATIC_CAST(
int *, realloc(psDBF->panFieldDecimals, sizeof(int) * psDBF->nFields));

psDBF->pachFieldType = STATIC_CAST(
char *, realloc(psDBF->pachFieldType, sizeof(char) * psDBF->nFields));

/* update header information */
psDBF->nHeaderLength -= XBASE_FLDHDR_SZ;
psDBF->nRecordLength -= nDeletedFieldSize;
Expand All @@ -1863,13 +1939,33 @@ int SHPAPI_CALL DBFDeleteField(DBFHandle psDBF, int iField)
psDBF->pszHeader + (iField + 1) * XBASE_FLDHDR_SZ,
sizeof(char) * (psDBF->nFields - iField) * XBASE_FLDHDR_SZ);

psDBF->pszHeader = STATIC_CAST(
psDBF_char_realloc_ptr = STATIC_CAST(
char *, realloc(psDBF->pszHeader, psDBF->nFields * XBASE_FLDHDR_SZ));

if (!psDBF_char_realloc_ptr)
{
assert(false);
return FALSE;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there would be much more work to restore the psDBF state to a consistente state... I'm afraid that the best in that method would be to just "assert(false); return FALSE;" on failed memory allocations. Probably the same in DBFAlterFieldDefn()

}
else
{
psDBF->pszHeader = psDBF_char_realloc_ptr;
}

/* update size of current record appropriately */
psDBF->pszCurrentRecord = STATIC_CAST(
psDBF_char_realloc_ptr = STATIC_CAST(
char *, realloc(psDBF->pszCurrentRecord, psDBF->nRecordLength));

if (!psDBF_char_realloc_ptr)
{
assert(false);
return FALSE;
}
else
{
psDBF->pszCurrentRecord = psDBF_char_realloc_ptr;
}

/* we're done if we're dealing with not yet created .dbf */
if (psDBF->bNoHeader && psDBF->nRecords == 0)
return TRUE;
Expand Down Expand Up @@ -2135,8 +2231,19 @@ int SHPAPI_CALL DBFAlterFieldDefn(DBFHandle psDBF, int iField,
psDBF->panFieldOffset[i] += nWidth - nOldWidth;
psDBF->nRecordLength += nWidth - nOldWidth;

psDBF->pszCurrentRecord = STATIC_CAST(
char *psDBF_realloc_ptr = STATIC_CAST(
char *, realloc(psDBF->pszCurrentRecord, psDBF->nRecordLength));

if (!psDBF_realloc_ptr)
{
psDBF->nFields--;
ymdatta marked this conversation as resolved.
Show resolved Hide resolved
assert(false);
return FALSE;
}
else
{
psDBF->pszCurrentRecord = psDBF_realloc_ptr;
}
}

/* we're done if we're dealing with not yet created .dbf */
Expand Down
Loading