diff options
| author | Remi Collet <remi@remirepo.net> | 2020-02-04 17:40:07 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-02-04 17:40:07 +0100 |
| commit | 18c7e37c318883a27e8612ba291a70465bdbaeaa (patch) | |
| tree | f69389bcc445121ca2092faee6418d008ec9b909 /c88f94839aab4cfe4507588fcd658184bcbce284.patch | |
| parent | 566104f0a3bf34c619c3d0bc77e5a1783fd3ee01 (diff) | |
update to 2.6.2
Diffstat (limited to 'c88f94839aab4cfe4507588fcd658184bcbce284.patch')
| -rw-r--r-- | c88f94839aab4cfe4507588fcd658184bcbce284.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/c88f94839aab4cfe4507588fcd658184bcbce284.patch b/c88f94839aab4cfe4507588fcd658184bcbce284.patch deleted file mode 100644 index b1694b7..0000000 --- a/c88f94839aab4cfe4507588fcd658184bcbce284.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c88f94839aab4cfe4507588fcd658184bcbce284 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 20 Jan 2020 15:04:56 +0100 -Subject: [PATCH] fix possible segfault if htresp is null - -close #23 - -Change-Id: Ia4dea8793a86a4ded07ccecc52e625842c098811 -Reviewed-on: http://review.couchbase.org/121246 -Tested-by: Build Bot <build@couchbase.com> -Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com> ---- - src/couchbase/bucket/n1ql.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/couchbase/bucket/n1ql.c b/src/couchbase/bucket/n1ql.c -index 7d60b6b..8d8da13 100644 ---- a/src/couchbase/bucket/n1ql.c -+++ b/src/couchbase/bucket/n1ql.c -@@ -81,8 +81,13 @@ static void n1qlrow_callback(lcb_t instance, int ignoreme, const lcb_RESPN1QL *r - } - } - if (!reported) { -- pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %d: %.*s", (int)resp->htresp->htstatus, -- (int)resp->nrow, (char *)resp->row); -+ if (resp->htresp) { -+ pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %d: %.*s", (int)resp->htresp->htstatus, -+ (int)resp->nrow, (char *)resp->row); -+ } else { -+ pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %.*s", -+ (int)resp->nrow, (char *)resp->row); -+ } - } - } - |