database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-15 19:15:29 +03:00
Code

Use palloc in TopMemoryContext instead of malloc

Browse Source 
As discussed, even if the PL needs a permanent memory location, it
should use palloc, not malloc.  It also makes error handling easier.

Jan Urbański
This commit is contained in:
Peter Eisentraut 2011-01-18 23:27:53 +02:00
parent 88047e59ba
commit 59ea9ef9aa
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pl/plpython/plpython.c
View File

@ -1605,7 +1605,7 @@ PLy_procedure_compile(PLyProcedure *proc, const char *src)
*/ */
msrc = PLy_procedure_munge_source(proc->pyname, src); msrc = PLy_procedure_munge_source(proc->pyname, src);
crv = PyRun_String(msrc, Py_file_input, proc->globals, NULL); crv = PyRun_String(msrc, Py_file_input, proc->globals, NULL);
free(msrc); pfree(msrc);
if (crv != NULL) if (crv != NULL)
{ {
@ -1642,7 +1642,7 @@ PLy_procedure_munge_source(const char *name, const char *src)
*/ */
mlen = (strlen(src) * 2) + strlen(name) + 16; mlen = (strlen(src) * 2) + strlen(name) + 16;
mrc = PLy_malloc(mlen); mrc = palloc(mlen);
plen = snprintf(mrc, mlen, "def %s():\n\t", name); plen = snprintf(mrc, mlen, "def %s():\n\t", name);
Assert(plen >= 0 && plen < mlen); Assert(plen >= 0 && plen < mlen);
@ -3664,13 +3664,8 @@ PLy_traceback(int *xlevel)
static void * static void *
PLy_malloc(size_t bytes) PLy_malloc(size_t bytes)
{ {
void *ptr = malloc(bytes); /* We need our allocations to be long-lived, so use TopMemoryContext */
return MemoryContextAlloc(TopMemoryContext, bytes);
if (ptr == NULL)
ereport(FATAL,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory")));
return ptr;
} }
static void * static void *
@ -3699,7 +3694,7 @@ PLy_strdup(const char *str)
static void static void
PLy_free(void *ptr) PLy_free(void *ptr)
{ {
free(ptr); pfree(ptr);
} }
/* /*