blob: d489891930a39a9762a5a5f003d8332bd0497142 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
Description: Backport of
From c69d4cc90c0e27703030b3ff09f91bf4dcbcfd51 Mon Sep 17 00:00:00 2001
From: Stefan Eissing <icing@apache.org>
Date: Tue, 10 Aug 2021 08:55:54 +0000
Subject: [PATCH] Merged r1892012 from trunk:
.
and
From ac62c7e7436560cf4f7725ee586364ce95c07804 Mon Sep 17 00:00:00 2001
From: Graham Leggett <minfrin@apache.org>
Date: Sat, 21 Aug 2021 21:35:04 +0000
Subject: [PATCH] Backport:
Author: Moritz Muehlenhoff <jmm@inutil.org>
Origin: upstream
Forwarded: not-needed
Last-Update: 2021-09-30
--- a/server/util.c
+++ b/server/util.c
@@ -2460,13 +2460,12 @@
* in front of every " that doesn't already have one.
*/
while (*inchr != '\0') {
- if ((*inchr == '\\') && (inchr[1] != '\0')) {
- *outchr++ = *inchr++;
- *outchr++ = *inchr++;
- }
if (*inchr == '"') {
*outchr++ = '\\';
}
+ if ((*inchr == '\\') && (inchr[1] != '\0')) {
+ *outchr++ = *inchr++;
+ }
if (*inchr != '\0') {
*outchr++ = *inchr++;
}
|
