Skip to content

Commit

Permalink
Avoid relying on symbol re-mapping.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/trunk@87319 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
kalibera committed Nov 11, 2024
1 parent 2a507a9 commit 6019f11
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/gnuwin32/dos_wglob.c
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ globextend(const wchar_t *path, wglob_t *pglob, size_t *limitp)
pathv = R_Calloc(newsize, wchar_t *);
if (pathv == NULL) {
if (pglob->gl_pathv) {
Free(pglob->gl_pathv);
R_Free(pglob->gl_pathv);
pglob->gl_pathv = NULL;
}
return(GLOB_NOSPACE);
Expand Down Expand Up @@ -924,8 +924,8 @@ dos_wglobfree(wglob_t *pglob)
pp = pglob->gl_pathv + pglob->gl_offs;
for (i = pglob->gl_pathc; i--; ++pp)
if (*pp)
Free(*pp);
Free(pglob->gl_pathv);
R_Free(*pp);
R_Free(pglob->gl_pathv);
pglob->gl_pathv = NULL;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/library/utils/src/windows/dialogs.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* file dialogs.c
* Copyright (C) 1998--2003 Guido Masarotto and Brian Ripley
* Copyright (C) 2004 The R Foundation
* Copyright (C) 2005--2023 The R Core Team
* Copyright (C) 2005--2024 The R Core Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -54,7 +54,7 @@ static void pbarFinalizer(SEXP ptr)
if(pbar-> lab) del(pbar->lab);
del(pbar->pb);
del(pbar->wprog);
Free(pbar);
R_Free(pbar);
R_ClearExternalPtr(ptr); /* not really needed */
}

Expand Down

0 comments on commit 6019f11

Please sign in to comment.