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

[pull] master from OSGeo:master #75

Merged
merged 3 commits into from
May 17, 2024
Merged

[pull] master from OSGeo:master #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83f1941
MiraMonVector: Fixing chromium bug 68809
AbelPau May 16, 2024
c31cbe0
Merge pull request #9954 from AbelPau/Fix-gdal_vector_translate_fuzze…
rouault May 16, 2024
758af97
README.md: update Travis-CI badge [ci skip]
rouault May 16, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GDAL - Geospatial Data Abstraction Library
[![Build Status](https://github.com/OSGeo/gdal/actions/workflows/clang_static_analyzer.yml/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22CLang+Static+Analyzer%22+branch%3Amaster)
[![Build Status](https://github.com/OSGeo/gdal/actions/workflows/code_checks.yml/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22Code+Checks%22+branch%3Amaster)
[![Build Status](https://github.com/OSGeo/gdal/actions/workflows/conda.yml/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22Conda%22+branch%3Amaster)
[![Build Status](https://travis-ci.com/OSGeo/gdal.svg?branch=master)](https://travis-ci.com/OSGeo/gdal)
[![Build Status](https://app.travis-ci.com/OSGeo/gdal.svg?branch=master)](https://app.travis-ci.com/OSGeo/gdal)
[![Build Status](https://scan.coverity.com/projects/749/badge.svg?flat=1)](https://scan.coverity.com/projects/gdal)
[![Documentation build Status](https://github.com/OSGeo/gdal/workflows/Docs/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22Docs%22+branch%3Amaster)
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/gdal.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:gdal)
Expand Down
16 changes: 10 additions & 6 deletions ogr/ogrsf_frmts/miramon/mm_gdal_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1695,13 +1695,17 @@ int MM_ReadExtendedDBFHeaderFromFile(const char *szFileName,
return 0;
} // End of MM_ReadExtendedDBFHeaderFromFile()

void MM_ReleaseDBFHeader(struct MM_DATA_BASE_XP *data_base_XP)
void MM_ReleaseDBFHeader(struct MM_DATA_BASE_XP **data_base_XP)
{
if (data_base_XP)
{
MM_ReleaseMainFields(data_base_XP);
free_function(data_base_XP);
}
if (!data_base_XP)
return;
if (!*data_base_XP)
return;

MM_ReleaseMainFields(*data_base_XP);
free_function(*data_base_XP);
*data_base_XP = nullptr;

return;
}

Expand Down
2 changes: 1 addition & 1 deletion ogr/ogrsf_frmts/miramon/mm_gdal_functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ MM_GiveOffsetExtendedFieldName(const struct MM_FIELD *camp);
struct MM_DATA_BASE_XP *MM_CreateDBFHeader(MM_EXT_DBF_N_FIELDS n_camps,
MM_BYTE nCharSet);
void MM_ReleaseMainFields(struct MM_DATA_BASE_XP *data_base_XP);
void MM_ReleaseDBFHeader(struct MM_DATA_BASE_XP *data_base_XP);
void MM_ReleaseDBFHeader(struct MM_DATA_BASE_XP **data_base_XP);
MM_BOOLEAN MM_CreateAndOpenDBFFile(struct MM_DATA_BASE_XP *bd_xp,
const char *NomFitxer);
int MM_DuplicateFieldDBXP(struct MM_FIELD *camp_final,
Expand Down
4 changes: 2 additions & 2 deletions ogr/ogrsf_frmts/miramon/mm_wrlayr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7397,8 +7397,8 @@ static void MMDestroyMMDBFile(struct MiraMonVectLayerInfo *hMiraMonLayer,

if (pMMAdmDB && pMMAdmDB->pMMBDXP)
{
MM_ReleaseDBFHeader(pMMAdmDB->pMMBDXP);
hMiraMonLayer->pMMBDXP = pMMAdmDB->pMMBDXP = nullptr;
MM_ReleaseDBFHeader(&pMMAdmDB->pMMBDXP);
hMiraMonLayer->pMMBDXP = nullptr;
}
if (pMMAdmDB && pMMAdmDB->pRecList)
{
Expand Down
Loading