Fix brianc#2556 (handleRowDescription of null) by keeping callback errors from interfering with cleanup

prust · prust · commit c9f9caf08076 · 2022-05-30T22:43:05.000-07:00
diff --git a/packages/pg/lib/query.js b/packages/pg/lib/query.js
@@ -135,7 +135,14 @@ class Query extends EventEmitter {
       return this.handleError(this._canceledDueToError, con)
     }
     if (this.callback) {
-      this.callback(null, this._results)
+      try {
+        this.callback(null, this._results)
+      }
+      catch(err) {
+        process.nextTick(() => {
+          throw err
+        })
+      }
     }
     this.emit('end', this._results)
   }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,14 @@ class Query extends EventEmitter {`
`135`	`135`	`return this.handleError(this._canceledDueToError, con)`
`136`	`136`	`}`
`137`	`137`	`if (this.callback) {`
`138`		`- this.callback(null, this._results)`
	`138`	`+ try {`
	`139`	`+ this.callback(null, this._results)`
	`140`	`+ }`
	`141`	`+ catch(err) {`
	`142`	`+ process.nextTick(() => {`
	`143`	`+ throw err`
	`144`	`+ })`
	`145`	`+ }`
`139`	`146`	`}`
`140`	`147`	`this.emit('end', this._results)`
`141`	`148`	`}`