aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2013-07-23 17:38:32 -0400
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2013-07-23 17:38:32 -0400
commit5ef42547c3c55a0d743ea3fabe165ce3bcc3d3c8 (patch)
tree01dddfda6ecf3c17bf2c79e236fdde9269d4c64b
parentb81d0691b9c6cc249511b92bb4b96f3a99a91eb0 (diff)
downloadpostgresql-5ef42547c3c55a0d743ea3fabe165ce3bcc3d3c8.tar.gz
postgresql-5ef42547c3c55a0d743ea3fabe165ce3bcc3d3c8.zip
Check for NULL result from strdup
Per Coverity Scan
-rw-r--r--src/interfaces/libpq/fe-secure.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index 174cf426f06..a6a09cd1ab2 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -1131,7 +1131,17 @@ initialize_SSL(PGconn *conn)
{
/* Colon, but not in second character, treat as engine:key */
char *engine_str = strdup(conn->sslkey);
- char *engine_colon = strchr(engine_str, ':');
+ char *engine_colon;
+
+ if (engine_str == NULL)
+ {
+ printfPQExpBuffer(&conn->errorMessage,
+ libpq_gettext("out of memory\n"));
+ return -1;
+ }
+
+ /* cannot return NULL because we already checked before strdup */
+ engine_colon = strchr(engine_str, ':');
*engine_colon = '\0'; /* engine_str now has engine name */
engine_colon++; /* engine_colon now has key name */