Skip to content
Snippets Groups Projects
Commit c31b5d9d authored by Heikki Linnakangas's avatar Heikki Linnakangas
Browse files

Fix memory leaks on OOM in ecpg. 

These are fairly obscure cases, but let's keep Coverity happy.

Michael Paquier with some further fixes by me.
parent ff8ca3b0
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/interfaces/ecpg/ecpglib/execute.c
+ 28
− 4
View file @ c31b5d9d
...@@ -803,7 +803,10 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -803,7 +803,10 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
mallocedval = quote_postgres(newcopy, quote, lineno); mallocedval = quote_postgres(newcopy, quote, lineno);
if (!mallocedval) if (!mallocedval)
{
ecpg_free(newcopy);
return false; return false;
}
*tobeinserted_p = mallocedval; *tobeinserted_p = mallocedval;
} }
...@@ -835,7 +838,10 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -835,7 +838,10 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
mallocedval = quote_postgres(newcopy, quote, lineno); mallocedval = quote_postgres(newcopy, quote, lineno);
if (!mallocedval) if (!mallocedval)
{
ecpg_free(newcopy);
return false; return false;
}
*tobeinserted_p = mallocedval; *tobeinserted_p = mallocedval;
} }
...@@ -859,7 +865,10 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -859,7 +865,10 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
nval = PGTYPESnumeric_new(); nval = PGTYPESnumeric_new();
if (!nval) if (!nval)
{
ecpg_free(mallocedval);
return false; return false;
}
if (var->type == ECPGt_numeric) if (var->type == ECPGt_numeric)
result = PGTYPESnumeric_copy((numeric *) ((var + var->offset * element)->value), nval); result = PGTYPESnumeric_copy((numeric *) ((var + var->offset * element)->value), nval);
...@@ -869,6 +878,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -869,6 +878,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
if (result != 0) if (result != 0)
{ {
PGTYPESnumeric_free(nval); PGTYPESnumeric_free(nval);
ecpg_free(mallocedval);
return false; return false;
} }
...@@ -876,11 +886,13 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -876,11 +886,13 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
slen = strlen(str); slen = strlen(str);
PGTYPESnumeric_free(nval); PGTYPESnumeric_free(nval);
if (!(mallocedval = ecpg_realloc(mallocedval, strlen(mallocedval) + slen + 2, lineno))) if (!(newcopy = ecpg_realloc(mallocedval, strlen(mallocedval) + slen + 2, lineno)))
{ {
ecpg_free(mallocedval);
ecpg_free(str); ecpg_free(str);
return false; return false;
} }
mallocedval = newcopy;
memcpy(mallocedval + strlen(mallocedval), str, slen + 1); memcpy(mallocedval + strlen(mallocedval), str, slen + 1);
strcpy(mallocedval + strlen(mallocedval), ","); strcpy(mallocedval + strlen(mallocedval), ",");
...@@ -940,14 +952,19 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -940,14 +952,19 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
{ {
str = quote_postgres(PGTYPESinterval_to_asc((interval *) ((var + var->offset * element)->value)), quote, lineno); str = quote_postgres(PGTYPESinterval_to_asc((interval *) ((var + var->offset * element)->value)), quote, lineno);
if (!str) if (!str)
{
ecpg_free(mallocedval);
return false; return false;
}
slen = strlen(str); slen = strlen(str);
if (!(mallocedval = ecpg_realloc(mallocedval, strlen(mallocedval) + slen + 2, lineno))) if (!(newcopy = ecpg_realloc(mallocedval, strlen(mallocedval) + slen + 2, lineno)))
{ {
ecpg_free(mallocedval);
ecpg_free(str); ecpg_free(str);
return false; return false;
} }
mallocedval = newcopy;
memcpy(mallocedval + strlen(mallocedval), str, slen + 1); memcpy(mallocedval + strlen(mallocedval), str, slen + 1);
strcpy(mallocedval + strlen(mallocedval), ","); strcpy(mallocedval + strlen(mallocedval), ",");
...@@ -991,14 +1008,19 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -991,14 +1008,19 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
{ {
str = quote_postgres(PGTYPESdate_to_asc(*(date *) ((var + var->offset * element)->value)), quote, lineno); str = quote_postgres(PGTYPESdate_to_asc(*(date *) ((var + var->offset * element)->value)), quote, lineno);
if (!str) if (!str)
{
ecpg_free(mallocedval);
return false; return false;
}
slen = strlen(str); slen = strlen(str);
if (!(mallocedval = ecpg_realloc(mallocedval, strlen(mallocedval) + slen + 2, lineno))) if (!(newcopy = ecpg_realloc(mallocedval, strlen(mallocedval) + slen + 2, lineno)))
{ {
ecpg_free(mallocedval);
ecpg_free(str); ecpg_free(str);
return false; return false;
} }
mallocedval = newcopy;
memcpy(mallocedval + strlen(mallocedval), str, slen + 1); memcpy(mallocedval + strlen(mallocedval), str, slen + 1);
strcpy(mallocedval + strlen(mallocedval), ","); strcpy(mallocedval + strlen(mallocedval), ",");
...@@ -1049,11 +1071,13 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -1049,11 +1071,13 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
slen = strlen(str); slen = strlen(str);
if (!(mallocedval = ecpg_realloc(mallocedval, strlen(mallocedval) + slen + 2, lineno))) if (!(newcopy = ecpg_realloc(mallocedval, strlen(mallocedval) + slen + 2, lineno)))
{ {
ecpg_free(mallocedval);
ecpg_free(str); ecpg_free(str);
return false; return false;
} }
mallocedval = newcopy;
memcpy(mallocedval + strlen(mallocedval), str, slen + 1); memcpy(mallocedval + strlen(mallocedval), str, slen + 1);
strcpy(mallocedval + strlen(mallocedval), ","); strcpy(mallocedval + strlen(mallocedval), ",");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment