From c0a381eab26e3e53711ba15e5a2c47f995beeaf9 Mon Sep 17 00:00:00 2001
From: "Brian M. Carlson" <brian.m.carlson@gmail.com>
Date: Sat, 12 Aug 2017 16:04:29 -0500
Subject: [PATCH] Fix vulnerability

---
 lib/result.js                                     | 15 ++++++++-------
 package.json                                      |  1 +
 .../integration/client/field-name-escape-tests.js | 10 ++++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 test/integration/client/field-name-escape-tests.js

diff --git a/lib/result.js b/lib/result.js
index 463fbdb..2955d92 100644
--- a/lib/result.js
+++ b/lib/result.js
@@ -7,6 +7,7 @@
  */
 
 var types = require('pg-types');
+var escape = require('js-string-escape');
 
 //result object returned from query
 //in the 'end' event and also
@@ -75,13 +76,13 @@ Result.prototype.addRow = function(row) {
 
 var inlineParser = function(fieldName, i) {
   return "\nthis['" +
-    //fields containing single quotes will break
-    //the evaluated javascript unless they are escaped
-    //see https://github.com/brianc/node-postgres/issues/507
-    //Addendum: However, we need to make sure to replace all
-    //occurences of apostrophes, not just the first one.
-    //See https://github.com/brianc/node-postgres/issues/934
-    fieldName.replace(/'/g, "\\'") +
+    // fields containing single quotes will break
+    // the evaluated javascript unless they are escaped
+    // see https://github.com/brianc/node-postgres/issues/507
+    // Addendum: However, we need to make sure to replace all
+    // occurences of apostrophes, not just the first one.
+    // See https://github.com/brianc/node-postgres/issues/934
+    escape(fieldName) +
     "'] = " +
     "rowData[" + i + "] == null ? null : parsers[" + i + "](rowData[" + i + "]);";
 };
diff --git a/package.json b/package.json
index 5d7b20c..9c09ef5 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   "main": "./lib",
   "dependencies": {
     "buffer-writer": "1.0.1",
+    "js-string-escape": "1.0.1",
     "packet-reader": "0.2.0",
     "pg-connection-string": "0.1.3",
     "pg-pool": "1.*",
diff --git a/test/integration/client/field-name-escape-tests.js b/test/integration/client/field-name-escape-tests.js
new file mode 100644
index 0000000..146ad1b
--- /dev/null
+++ b/test/integration/client/field-name-escape-tests.js
@@ -0,0 +1,10 @@
+var pg = require('./test-helper').pg
+
+var sql = 'SELECT 1 AS "\\\'/*", 2 AS "\\\'*/\n + process.exit(-1)] = null;\n//"'
+
+var client = new pg.Client()
+client.connect()
+client.query(sql, function (err, res) {
+  if (err) throw err
+  client.end()
+})