Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/
Date: Thu, 02 May 2019 15:17:07
Message-Id: 1556810176.b6866cb7cbe9172ad2ac46e5e72b71901ec44841.grobian@gentoo
1 commit: b6866cb7cbe9172ad2ac46e5e72b71901ec44841
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 2 15:16:16 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu May 2 15:16:16 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b6866cb7
7
8 libq/cache: fix handling of (escaped) quotes in cache_read_file_ebuild
9
10 Bug: https://bugs.gentoo.org/684252
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 libq/cache.c | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16 diff --git a/libq/cache.c b/libq/cache.c
17 index b11e068..ee3a47c 100644
18 --- a/libq/cache.c
19 +++ b/libq/cache.c
20 @@ -429,8 +429,11 @@ cache_read_file_ebuild(cache_pkg_ctx *pkg_ctx)
21 for (r = p - 1; r > q; r--)
22 if (*r != '\\')
23 break;
24 - if (r != q && (p - 1 - r) % 2 == 1)
25 + if (r != q && (p - 1 - r) % 2 == 1) {
26 + /* escaped, move along */
27 + p++;
28 continue;
29 + }
30 }
31 break;
32 } while (1);