Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/985276/?format=api
{ "id": 985276, "url": "http://patchwork.ozlabs.org/api/patches/985276/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20181017082702.5581-26-armbru@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20181017082702.5581-26-armbru@redhat.com>", "list_archive_url": null, "date": "2018-10-17T08:26:49", "name": "[v4,25/38] ui/keymaps: Fix handling of erroneous include files", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "05a7d97e9298b729203cbb05a05a5929d34a1196", "submitter": { "id": 2645, "url": "http://patchwork.ozlabs.org/api/people/2645/?format=api", "name": "Markus Armbruster", "email": "armbru@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20181017082702.5581-26-armbru@redhat.com/mbox/", "series": [ { "id": 71196, "url": "http://patchwork.ozlabs.org/api/series/71196/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=71196", "date": "2018-10-17T08:26:36", "name": "Replace some unwise uses of error_report() & friends", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/71196/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/985276/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/985276/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 42ZmTR4kkRz9s8T\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Oct 2018 20:04:43 +1100 (AEDT)", "from localhost ([::1]:34714 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1gChku-0006Af-Va\n\tfor incoming@patchwork.ozlabs.org; Wed, 17 Oct 2018 05:04:41 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51471)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChB4-0000Kv-Ue\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:40 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChB1-0001x0-Gm\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:38 -0400", "from mx1.redhat.com ([209.132.183.28]:33522)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <armbru@redhat.com>) id 1gChAx-0001G0-Tv\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:33 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 53F4B30832E9\n\tfor <qemu-devel@nongnu.org>; Wed, 17 Oct 2018 08:27:14 +0000 (UTC)", "from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com\n\t[10.36.116.50])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 2E7E578980;\n\tWed, 17 Oct 2018 08:27:09 +0000 (UTC)", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 6F0D011562E4; Wed, 17 Oct 2018 10:27:02 +0200 (CEST)" ], "From": "Markus Armbruster <armbru@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 17 Oct 2018 10:26:49 +0200", "Message-Id": "<20181017082702.5581-26-armbru@redhat.com>", "In-Reply-To": "<20181017082702.5581-1-armbru@redhat.com>", "References": "<20181017082702.5581-1-armbru@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.44]);\n\tWed, 17 Oct 2018 08:27:14 +0000 (UTC)", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH v4 25/38] ui/keymaps: Fix handling of erroneous\n\tinclude files", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Gerd Hoffmann <kraxel@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "While errors in the keyboard layout named with -k are fatal, errors in\nincluded files are reported, but otherwise ignored:\n\n $ cat worst\n include bad\n include worse\n $ ls -l bad worse\n ls: cannot access 'bad': No such file or directory\n ls: cannot access 'worse': No such file or directory\n $ qemu-system-x86_64 -nodefaults -S -monitor stdio -display vnc=:0 -k bad\n QEMU 3.0.50 monitor - type 'help' for more information\n (qemu) Could not read keymap file: 'bad'\n $ qemu-system-x86_64 -nodefaults -S -monitor stdio -display vnc=:0 -k worst\n QEMU 3.0.50 monitor - type 'help' for more information\n (qemu) Could not read keymap file: 'bad'\n Could not read keymap file: 'worse'\n\nFix that.\n\nNote that parse_keyboard_layout() allocates the keymap, except when\nit's parsing an include file. To keep error handling simple, move the\nmemory management to its caller init_keyboard_layout().\n\nCc: Gerd Hoffmann <kraxel@redhat.com>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\n---\n ui/keymaps.c | 35 +++++++++++++++++++++++------------\n 1 file changed, 23 insertions(+), 12 deletions(-)", "diff": "diff --git a/ui/keymaps.c b/ui/keymaps.c\nindex 43fe604724..b05fb028dc 100644\n--- a/ui/keymaps.c\n+++ b/ui/keymaps.c\n@@ -79,10 +79,11 @@ static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k)\n trace_keymap_add(keysym, keycode, line);\n }\n \n-static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,\n- const char *language,\n- kbd_layout_t *k)\n+static int parse_keyboard_layout(kbd_layout_t *k,\n+ const name2keysym_t *table,\n+ const char *language)\n {\n+ int ret;\n FILE *f;\n char * filename;\n char line[1024];\n@@ -95,12 +96,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,\n g_free(filename);\n if (!f) {\n fprintf(stderr, \"Could not read keymap file: '%s'\\n\", language);\n- return NULL;\n- }\n-\n- if (!k) {\n- k = g_new0(kbd_layout_t, 1);\n- k->hash = g_hash_table_new(NULL, NULL);\n+ return -1;\n }\n \n for(;;) {\n@@ -118,7 +114,10 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,\n continue;\n }\n if (!strncmp(line, \"include \", 8)) {\n- parse_keyboard_layout(table, line + 8, k);\n+ if (parse_keyboard_layout(k, table, line + 8) < 0) {\n+ ret = -1;\n+ goto out;\n+ }\n } else {\n int offset = 0;\n while (line[offset] != 0 &&\n@@ -164,15 +163,27 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,\n }\n }\n }\n+\n+ ret = 0;\n+out:\n fclose(f);\n- return k;\n+ return ret;\n }\n \n \n kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,\n const char *language)\n {\n- return parse_keyboard_layout(table, language, NULL);\n+ kbd_layout_t *k;\n+\n+ k = g_new0(kbd_layout_t, 1);\n+ k->hash = g_hash_table_new(NULL, NULL);\n+ if (parse_keyboard_layout(k, table, language) < 0) {\n+ g_hash_table_unref(k->hash);\n+ g_free(k);\n+ return NULL;\n+ }\n+ return k;\n }\n \n \n", "prefixes": [ "v4", "25/38" ] }