From patchwork Tue Dec 25 05:26:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1018345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::83b; helo=mail-qt1-x83b.google.com; envelope-from=swupdate+bncbcl4hcw73qcbbgx7q3qqkgqehoejz3q@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="rLmIooWU"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="K89hGIrO"; dkim-atps=neutral Received: from mail-qt1-x83b.google.com (mail-qt1-x83b.google.com [IPv6:2607:f8b0:4864:20::83b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43P4NG2qpJz9sCr for ; Tue, 25 Dec 2018 16:26:53 +1100 (AEDT) Received: by mail-qt1-x83b.google.com with SMTP id w15sf17609715qtk.19 for ; Mon, 24 Dec 2018 21:26:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1545715610; cv=pass; d=google.com; s=arc-20160816; b=gX8D7rxTSkclQNO1RRs6P2SvjbuklVfJIksGJABjMOsN0mUHLpZxRFZO43js/wrnWh Rmgpq7zHcBExj6okp+qhgWXdRD7pk0da8VAI6Bjn4GzckUVY4aF72ZF9trV8OdT4q26M SZ/Ul4ednrgAd1remOT5uA7Y+WIAHMOnWP63EMtIdBdMUP4UaiEnfHFAYpiBQmAGf861 DGzeZsPueD33n82Kf40kpr/cM8fXwXOo9HJYMTxkMG1mB6pEJ3EXeN/mS6Ln/OfF/Es6 TKsCnGACtl4961Q0rscBqGAZkgxwf4ySBG4BeroEvomlKlFq/B/mxrCpizhEQuKCAZNY rQVw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:message-id:date:subject:cc:to:from :mime-version:sender:dkim-signature:dkim-signature; bh=7mE4v0zkncxiLGBfljos0Gl87LGJXnUac7x6MfhWmQo=; b=qRdcXwS4thZ1XMloMTfqtV6uFKrWKEiJyfAhHVek56iv1oeNxAsEiduciTcsPKfIh3 XPNciEXTgeoJLWGiKHcKaNbSbZ6Fa/q48Cwtd+92jIJhrjjGUCZZEnRH4+JuCCt6FXwT yeq+eogwwvmAP+kBU/x8N1bmhpUKD0mhogI+QFQztw792+uUY3brLHkzWSAIX/e2zGTQ vSA9a3upqreEwbwunkDarrGLOZaobWmnMjDDvnzaE+y1T/iuHuWNyuGCpxEkoMJ7fI5n UUF2Fycr0VObhuNbwQ/h2wjYH89DldqSCgWnwNUrUIis/mY6jJmpoO63gsiIqE4hBSrE xruA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EXBw4syL; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::32e as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=7mE4v0zkncxiLGBfljos0Gl87LGJXnUac7x6MfhWmQo=; b=rLmIooWUHtcBYSwG8HI+M1IzNJsCXJuLEy9r3tyOqEhImVuUFEaj3Ivvu8yRAg0Jnd xfvkKxOv1Q8goTLUM3y6T3jaTS6x+jgIEMpjSEyMedfLj9Qh80v3HjBNITR7zsFGLwAB 4ayf+iQSMXUfBXEyC/tJ0PlUX+Dmes3rgptH48qPRjscYxNysdps2ptvegO6M+TLcvZd D3yCtn1BfKch12Wcz3MGIoa5X9VffLwwZdGFOrMBFcqwDi1WF0J05uvolHkbty3IVBsA NRHtSspOjfdKRKS3jkBgmuFQstCRsXszKnfSpAHIidCz+YOldZ6qJvjOyWoZQ49AD42e g59g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:to:cc:subject:date:message-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=7mE4v0zkncxiLGBfljos0Gl87LGJXnUac7x6MfhWmQo=; b=K89hGIrO+7WEHznOTtsYFbPK23MTfo/4TM9GKpovq+C8itrRjijEm4LD7OEr/59Dp3 H8h3eLEWQNR+vxdt8ZwHWV+8vcPRNluFrJgI80EHAmW/QRpUFDonUrqaUBl/PVwGjid1 Yel+iJqnE6rbnAVFGcrk0dpJnzpRTbGRPtZaEXvpR3vqZcZ7gyEEkpefokpdeAWUaG+e IZ4XdAn8+mfVD96Kikuqzoo+NpP1zdzKjF8nJ6BSDdMsCh2Nsiubl9Dv3RMjK0YXmlLl GdbG31zurHUIH056khADrwPszQaoGP6fBx5fTCJH/Nc7t6US7hJaG7U5OJMda+eHK8wQ 1Rmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=7mE4v0zkncxiLGBfljos0Gl87LGJXnUac7x6MfhWmQo=; b=N2eG+BVgDoMSrfAp06rzvB8cxe063q9JovA0cCCe53qLTn+G7J8f0L4825d0JHnACH KDByWFtg0Vmo1dPoGY2bKdK5CaHpOuxYxje+0tmdUPYpyZN5uAtS8Hd8sC5cVi65dqqd IDfOJBQGHInbknwgRUMyvaE2GD1b4Y/xB6vff17wkAeZ4BxIYkubkKY1purH4kXE8tXC NKyPDezdcG9LQBdC5YN9mcmvSXFFhKvY4hQ9iZ1Cn8R5BZj4TlRanRGBnn5YXrx7/ePy kj9Qaeg4ZtNbW3pH4fQ1rXX9wCvPBtvZFjADzbFbL+QJoU1J1ugfNoLM4xwZaKvsRLTB nnmg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AJcUukcWx1PRXtWfOQ0m9hr2UM9LSGCdc6x6wTe6uAHARoZGJi6P1M40 TInBh3vQtr29q8LVSPlzAoU= X-Google-Smtp-Source: ALg8bN72E7Rijy41jf2T9SSFxlb2xu5EcYjHULd/0VNtvgQCv7l7S8kXYNrz74u4ME3tIwNtHSUhqQ== X-Received: by 2002:a37:77c5:: with SMTP id s188mr223372qkc.0.1545715610507; Mon, 24 Dec 2018 21:26:50 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:aed:3785:: with SMTP id j5ls4947394qtb.4.gmail; Mon, 24 Dec 2018 21:26:50 -0800 (PST) X-Received: by 2002:ac8:3364:: with SMTP id u33mr11275924qta.56.1545715610269; Mon, 24 Dec 2018 21:26:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545715610; cv=none; d=google.com; s=arc-20160816; b=AfHl+H+rd6Stp0CIMvulJ0cAQRjIpUypclIPTO8UsI1pKWNZO0AI3exuJzINVAuDtH 45tjk8yAYmIfMv6Cx79L1NuoO7K/T2XhzldWOel97np2cB7GJ5tUDigt93lORUjeBzP4 zK3dsb1iwBkc1rSUNIwzzZmXYTwC3MuQVTUQbQJ2YDLgY744tZnsEplvDmHUjivVRZ9o vyd9UVd3KLMVKpRqU6HW7XYfb6w8XMeRMJoRHoABjIe47KkaStXgmXIvirF/SivvFkeT 8ZaUTLKPXayw/FrMNonXBy/bWtRaG9JHYaPNEGqkRYjLZknA1kV36mzm8qvQqsuSs3n7 xbLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=xcG1+j65+qfcl+L4XwEbsl2/KIVczIP4zJi0w+dwJoA=; b=dNR36jR+VqFnfXdLBMJZX8yxhanLxAwcpfkEUPJ+HJkxyez7clD/aGk5Ivx/DNqGX9 um8LgdNCcXI6j3QzAf+Juh5MHoXMgOAiR5tdojhbcd4oc67HXErEa6eUEMJ/l967gVVi C5MtxrZC1KN9u1TdjNmxXg/lRgZgm6fEN+q/OOvzBeJVnyfEUM2zPcC5S/YjL8R43+9m nrsYF6zvchmIV8G9z5W/9nRx8JFkNbztLE4E9zB276LALe0VoCza9v6K4SUm0CP8SZLf 2IVTRCUiOMIRp9oj9UhjyRp1vfQubfQsyjigfnsI+VfYJKsi83y42JPnxTtqVfwpOeWQ Z0CQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EXBw4syL; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::32e as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com. [2607:f8b0:4864:20::32e]) by gmr-mx.google.com with ESMTPS id y15si1080535qtn.4.2018.12.24.21.26.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Dec 2018 21:26:50 -0800 (PST) Received-SPF: pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::32e as permitted sender) client-ip=2607:f8b0:4864:20::32e; Received: by mail-ot1-x32e.google.com with SMTP id i20so11959580otl.0 for ; Mon, 24 Dec 2018 21:26:50 -0800 (PST) X-Received: by 2002:a9d:7a8c:: with SMTP id l12mr10775788otn.335.1545715609566; Mon, 24 Dec 2018 21:26:49 -0800 (PST) Received: from localhost.localdomain ([47.187.31.127]) by smtp.gmail.com with ESMTPSA id a201sm21250819oii.27.2018.12.24.21.26.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Dec 2018 21:26:48 -0800 (PST) From: james.hilliard1@gmail.com To: swupdate@googlegroups.com Cc: James Hilliard Subject: [swupdate] [PATCH 1/1] lua: fix segfault in properties Date: Tue, 25 Dec 2018 13:26:36 +0800 Message-Id: <1545715596-20921-1-git-send-email-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.7.4 X-Original-Sender: james.hilliard1@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EXBw4syL; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::32e as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: James Hilliard Signed-off-by: James Hilliard --- corelib/lua_interface.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/corelib/lua_interface.c b/corelib/lua_interface.c index d4ebe4a..391d6b3 100644 --- a/corelib/lua_interface.c +++ b/corelib/lua_interface.c @@ -64,7 +64,7 @@ static bool is_type(lua_State *L, uintptr_t type) } #endif -static void lua_dump_table(lua_State *L, char *str, struct img_type *img, const char *key) +static void lua_dump_table(lua_State *L, char *str, struct img_type *img) { /* Stack: table, ... */ lua_pushnil(L); @@ -81,10 +81,11 @@ static void lua_dump_table(lua_State *L, char *str, struct img_type *img, const lua_tostring(L, -2)); if (img) { TRACE("Inserting property %s[%s] = %s", - key, + str, lua_tostring(L, -1), lua_tostring(L, -2)); - dict_insert_value(&img->properties, key, + dict_insert_value(&img->properties, + str, lua_tostring(L, -2)); } break; @@ -103,7 +104,7 @@ static void lua_dump_table(lua_State *L, char *str, struct img_type *img, const if (asprintf(&s, "%s %s:", str, propkey) != ENOMEM_ASPRINTF) { lua_pushvalue(L, -2); - lua_dump_table(L, s, img, propkey); + lua_dump_table(L, s, img); lua_pop(L, 1); free(s); } @@ -155,7 +156,7 @@ void LUAstackDump(lua_State *L) if (asprintf(&s, "(%d) [table ]", i) != ENOMEM_ASPRINTF) { lua_pushvalue(L, -1); - lua_dump_table(L, s, NULL, NULL); + lua_dump_table(L, s, NULL); lua_pop(L, 1); free(s); } @@ -592,7 +593,7 @@ static void table2image(lua_State* L, struct img_type *img) { if (!strcmp (lua_tostring(L, -2), "properties")) { dict_drop_db(&img->properties); lua_pushvalue(L, -1); - lua_dump_table(L, (char*)"properties", img, NULL); + lua_dump_table(L, (char*)"properties", img); lua_pop(L, 1); } break;