This routine was calling ecpg_alloc to allocate to memory but did not

Michael Meskes · Michael Meskes · commit 157d40640cdd · 2015-08-12T13:56:38.000+02:00
actually check the returned pointer allocated, potentially NULL which
could be the result of a malloc call.

Issue noted by Coverity, fixed by Michael Paquier &lt;michael@otacoo.com&gt;
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -446,15 +446,14 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				/* allocate storage if needed */
 				if (arrsize == 0 && *(void **) var == NULL)
 				{
-					void	   *mem = (void *) ecpg_alloc(offset * ntuples, lineno);
+					void	   *mem = (void *) ecpg_auto_alloc(offset * ntuples, lineno);
 
 					if (!mem)
 					{
 						va_end(args);
 						return false;
 					}
 					*(void **) var = mem;
-					ecpg_add_mem(mem, lineno);
 					var = mem;
 				}
 
@@ -524,15 +523,14 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 		/* allocate storage if needed */
 		if (data_var.ind_arrsize == 0 && data_var.ind_value == NULL)
 		{
-			void	   *mem = (void *) ecpg_alloc(data_var.ind_offset * ntuples, lineno);
+			void	   *mem = (void *) ecpg_auto_alloc(data_var.ind_offset * ntuples, lineno);
 
 			if (!mem)
 			{
 				va_end(args);
 				return false;
 			}
 			*(void **) data_var.ind_pointer = mem;
-			ecpg_add_mem(mem, lineno);
 			data_var.ind_value = mem;
 		}
 
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -398,23 +398,21 @@ ecpg_store_result(const PGresult *results, int act_field,
 		}
 
 		ecpg_log("ecpg_store_result on line %d: allocating memory for %d tuples\n", stmt->lineno, ntuples);
-		var->value = (char *) ecpg_alloc(len, stmt->lineno);
+		var->value = (char *) ecpg_auto_alloc(len, stmt->lineno);
 		if (!var->value)
 			return false;
 		*((char **) var->pointer) = var->value;
-		ecpg_add_mem(var->value, stmt->lineno);
 	}
 
 	/* allocate indicator variable if needed */
 	if ((var->ind_arrsize == 0 || var->ind_varcharsize == 0) && var->ind_value == NULL && var->ind_pointer != NULL)
 	{
 		int			len = var->ind_offset * ntuples;
 
-		var->ind_value = (char *) ecpg_alloc(len, stmt->lineno);
+		var->ind_value = (char *) ecpg_auto_alloc(len, stmt->lineno);
 		if (!var->ind_value)
 			return false;
 		*((char **) var->ind_pointer) = var->ind_value;
-		ecpg_add_mem(var->ind_value, stmt->lineno);
 	}
 
 	/* fill the variable with the tuple(s) */
diff --git a/src/interfaces/ecpg/ecpglib/extern.h b/src/interfaces/ecpg/ecpglib/extern.h
@@ -136,8 +136,7 @@ extern struct var_list *ivlist;
 
 /* Here are some methods used by the lib. */
 
-/* Returns a pointer to a string containing a simple type name. */
-void		ecpg_add_mem(void *ptr, int lineno);
+bool		ecpg_add_mem(void *ptr, int lineno);
 
 bool ecpg_get_data(const PGresult *, int, int, int, enum ECPGttype type,
 			  enum ECPGttype, char *, char *, long, long, long,
@@ -148,6 +147,7 @@ void		ecpg_pthreads_init(void);
 #endif
 struct connection *ecpg_get_connection(const char *);
 char	   *ecpg_alloc(long, int);
+char	   *ecpg_auto_alloc(long, int);
 char	   *ecpg_realloc(void *, long, int);
 void		ecpg_free(void *);
 bool		ecpg_init(const struct connection *, const char *, const int);
diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
@@ -104,14 +104,34 @@ static struct auto_mem *auto_allocs = NULL;
 #define set_auto_allocs(am)		do { auto_allocs = (am); } while(0)
 #endif
 
-void
+char *
+ecpg_auto_alloc(long size, int lineno)
+{
+	void	*ptr = (void *) ecpg_alloc(size, lineno);
+
+	if (!ptr)
+		return NULL;
+
+	if (!ecpg_add_mem(ptr, lineno))
+	{
+		ecpg_free(ptr);
+		return NULL;
+	}
+	return ptr;
+}
+
+bool
 ecpg_add_mem(void *ptr, int lineno)
 {
 	struct auto_mem *am = (struct auto_mem *) ecpg_alloc(sizeof(struct auto_mem), lineno);
 
+	if (!am)
+		return false;
+
 	am->pointer = ptr;
 	am->next = get_auto_allocs();
 	set_auto_allocs(am);
+	return true;
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -446,15 +446,14 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)`
`446`	`446`	`/* allocate storage if needed */`
`447`	`447`	`if (arrsize == 0 && (void *) var == NULL)`
`448`	`448`	`{`
`449`		`- void mem = (void ) ecpg_alloc(offset * ntuples, lineno);`
	`449`	`+ void mem = (void ) ecpg_auto_alloc(offset * ntuples, lineno);`
`450`	`450`
`451`	`451`	`if (!mem)`
`452`	`452`	`{`
`453`	`453`	`va_end(args);`
`454`	`454`	`return false;`
`455`	`455`	`}`
`456`	`456`	`(void *) var = mem;`
`457`		`- ecpg_add_mem(mem, lineno);`
`458`	`457`	`var = mem;`
`459`	`458`	`}`
`460`	`459`
`@@ -524,15 +523,14 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)`
`524`	`523`	`/* allocate storage if needed */`
`525`	`524`	`if (data_var.ind_arrsize == 0 && data_var.ind_value == NULL)`
`526`	`525`	`{`
`527`		`- void mem = (void ) ecpg_alloc(data_var.ind_offset * ntuples, lineno);`
	`526`	`+ void mem = (void ) ecpg_auto_alloc(data_var.ind_offset * ntuples, lineno);`
`528`	`527`
`529`	`528`	`if (!mem)`
`530`	`529`	`{`
`531`	`530`	`va_end(args);`
`532`	`531`	`return false;`
`533`	`532`	`}`
`534`	`533`	`(void *) data_var.ind_pointer = mem;`
`535`		`- ecpg_add_mem(mem, lineno);`
`536`	`534`	`data_var.ind_value = mem;`
`537`	`535`	`}`
`538`	`536`
Original file line number	Diff line number	Diff line change
`@@ -398,23 +398,21 @@ ecpg_store_result(const PGresult *results, int act_field,`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`ecpg_log("ecpg_store_result on line %d: allocating memory for %d tuples\n", stmt->lineno, ntuples);`
`401`		`- var->value = (char *) ecpg_alloc(len, stmt->lineno);`
	`401`	`+ var->value = (char *) ecpg_auto_alloc(len, stmt->lineno);`
`402`	`402`	`if (!var->value)`
`403`	`403`	`return false;`
`404`	`404`	`((char *) var->pointer) = var->value;`
`405`		`- ecpg_add_mem(var->value, stmt->lineno);`
`406`	`405`	`}`
`407`	`406`
`408`	`407`	`/* allocate indicator variable if needed */`
`409`	`408`	`if ((var->ind_arrsize == 0 \|\| var->ind_varcharsize == 0) && var->ind_value == NULL && var->ind_pointer != NULL)`
`410`	`409`	`{`
`411`	`410`	`int len = var->ind_offset * ntuples;`
`412`	`411`
`413`		`- var->ind_value = (char *) ecpg_alloc(len, stmt->lineno);`
	`412`	`+ var->ind_value = (char *) ecpg_auto_alloc(len, stmt->lineno);`
`414`	`413`	`if (!var->ind_value)`
`415`	`414`	`return false;`
`416`	`415`	`((char *) var->ind_pointer) = var->ind_value;`
`417`		`- ecpg_add_mem(var->ind_value, stmt->lineno);`
`418`	`416`	`}`
`419`	`417`
`420`	`418`	`/* fill the variable with the tuple(s) */`