>From 156e6faa96ad6a2ce58055ad72883ed78c576e5b Mon Sep 17 00:00:00 2001
From: Alex Shulgin <ash@commandprompt.com>
Date: Mon, 24 Nov 2014 16:55:50 +0300
Subject: [PATCH 1/3] Add missing check on OOM in expand_dbname path of
 conninfo_array_parse().

---
 src/interfaces/libpq/fe-connect.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
new file mode 100644
index 3fe8c21..d7f2ec2
*** a/src/interfaces/libpq/fe-connect.c
--- b/src/interfaces/libpq/fe-connect.c
*************** conninfo_array_parse(const char *const *
*** 4402,4407 ****
--- 4402,4415 ----
  								if (options[k].val)
  									free(options[k].val);
  								options[k].val = strdup(str_option->val);
+ 								if (!options[k].val)
+ 								{
+ 									printfPQExpBuffer(errorMessage,
+ 													  libpq_gettext("out of memory\n"));
+ 									PQconninfoFree(options);
+ 									PQconninfoFree(dbname_options);
+ 									return NULL;
+ 								}
  								break;
  							}
  						}
-- 
2.1.0

