From nobody Tue Feb 10 06:58:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1770401188; cv=none; d=zohomail.com; s=zohoarc; b=QVEhMdFe5hKdRsaGQv4ZdaPLX2esMMTOmmk+rh4F50OBUdjnQGR1cyomrWb2bww/Te6N40nM3vf/GzS+WHBaurOhAuNVZjoPomdQ3jnQVfwMDF+tf+LG1abYcnQS5mHfLyHNnwDY3IltbP7Zi2u+AV02xenhH3PBSU5SIgOWWc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770401188; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YLNn3Uva6SjJeQYlOxn8DYVVkX41Y1BiZ46SMJcyHmw=; b=ITPJqpdh38dOv/dPc0aAsCJ7mb7lQPNrxp7MrRbL/GNdPDz2H0U0wbPLoyslLH6PusLZ+1++dQGkSd3/dPXt6RlyK4Dot0qoIYkdIkW+eUSeKvQK/R5wPUl2goExL3gUigT35LFFTw2Z5WCyC4VOeKKkdC3a3T09bYMALZtOuSU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770401188853946.5404775455138; Fri, 6 Feb 2026 10:06:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voQCs-0007zJ-WD; Fri, 06 Feb 2026 13:05:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1voQCq-0007wu-Qx for qemu-devel@nongnu.org; Fri, 06 Feb 2026 13:05:24 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voQCp-0001RC-3C for qemu-devel@nongnu.org; Fri, 06 Feb 2026 13:05:24 -0500 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-b8838339fc6so46286066b.0 for ; Fri, 06 Feb 2026 10:05:22 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8edacaffeesm99446266b.38.2026.02.06.10.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 10:05:18 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0D355607B5; Fri, 06 Feb 2026 18:05:18 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770401121; x=1771005921; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YLNn3Uva6SjJeQYlOxn8DYVVkX41Y1BiZ46SMJcyHmw=; b=p8/bmDXAoVj0j/XVOYGDxYn7yuEQdz0MMZUWFdZN1ze3NAYlfXsjYpNjqNVnGDmdMp UPmGPTMygEQCO4ddB5XL6ee8ldiFhlrxGEoQB6bhFTbcE3+TKAS2blzeUyC/+k8erlyI oBq+wvoCNEsffdgifWljxlfzGbI7bkcYOMz43/vmXAQ108t5e+KD23ia7of9kZf56Gl/ tvL0V6euyhW4RlsnROMsOAv/JyFDRLuMB8lV8o6D2J+3VRS+o7YSyj/rsL1sKb8DGWbE DQL8Q0oZXD/o17k61TEV0+UH6ERJMOFT23P7kDJwdwRLxMEMEHr9UXlvCwl/x4RHpf7V 8V+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770401121; x=1771005921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YLNn3Uva6SjJeQYlOxn8DYVVkX41Y1BiZ46SMJcyHmw=; b=VNYEOuKgGrQlDsBSI2QnfwQ+U7OqQmZS5sqPutIuQZ6q6Yuol5id8ud2MMQ7pXeu0B RWZUOr/zVb3AcSjhJ8SLlsUFaf+sCC8j7loMnryUU3CWAGNaRT/2vVrRGFI+MSC7z3+M v3wYrCkKUdQ9hcdYjTs0vbCc1bgtdo4brrU8rwwlu0upVusMXg0ICAqREzpbA79qIZCo uOkAG4BMVPo9JbN3PcQV9L+3+OCmWFZPngTTfRYqMgUqc+6o+heb7saEXZdWLvsO9qW6 lrXTi92DuDxSct0RR7+Dp68U4M6FGfscgnP7uw+f8L+2cjONJIaBuaraOtsxD5WyrEfR LOWw== X-Gm-Message-State: AOJu0YxYQXPf9fkKui90iirxJqu30/C1hSqfaDcwYAcrdKarkrF+NuG+ occPAoxCLUWUxwRLYdpID841EEEnFDk+TAQmN9cX9WnRUA6ewIIoE0/mzZbGgpI8g14= X-Gm-Gg: AZuq6aLYeEmApx58b+uF+E+EnTjk3+faSX8KpVTKkX6bhqT6Ma2Omvo1Nx9xWgaq8IE +IDQpNZiJQiy9KJkp6AdGc0TUwDc76u9Y4DC6XD2u2abiXZxasuLhnohWxiUDu7x6yRz3Ih3zhz cnUuU8QXJEOG9F8REoRYDiF+VvFWsLYUy8eXx27IHcQqIaPLBBFKOkJA106wtL8ev+ByMBjnEc6 y0zfDPcfkClodI7eFcQsIFTSLD9VQKdGknRPyVA3NbXau6zZ1PacFmWG25iNSxy8kypVr83s65L Gf6jKfBTD4E4Y4oYp0Sd4din+4Ubla7LLnHZpit8ok/deohtLFHBqqgaoeJWDp5AWDVCoUoYtyS drLo9oXrZ5R6Lk5K8wkH1NpeRhh82wvNwnQx2NMua6Z5/pfkxj06qRVzkByi2FyqoR2bYKhrQ8a Qx9pzwyNWDtSU= X-Received: by 2002:a17:906:f598:b0:b79:eba9:83b4 with SMTP id a640c23a62f3a-b8edb7e3aa3mr269242366b.6.1770401121360; Fri, 06 Feb 2026 10:05:21 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 03/10] gdbstub: remove the need for goto cleanup Date: Fri, 6 Feb 2026 18:05:10 +0000 Message-ID: <20260206180517.1335861-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206180517.1335861-1-alex.bennee@linaro.org> References: <20260206180517.1335861-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1770401191293158500 We already set a default error reply which we can only overwrite if we successfully follow the chain of checks. Initialise the variables as NULL and use that to gate the construction of the filled out stop/reply packet. Message-ID: <20260203115201.2387721-4-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 1f8cd118924..aeff467fdd6 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -1413,36 +1413,33 @@ static void handle_v_cont(GArray *params, void *use= r_ctx) =20 static void handle_v_attach(GArray *params, void *user_ctx) { - GDBProcess *process; - CPUState *cpu; + GDBProcess *process =3D NULL; + CPUState *cpu =3D NULL; =20 + /* Default error reply */ g_string_assign(gdbserver_state.str_buf, "E22"); - if (!params->len) { - goto cleanup; - } - - process =3D gdb_get_process(gdb_get_cmd_param(params, 0)->val_ul); - if (!process) { - goto cleanup; + if (params->len) { + process =3D gdb_get_process(gdb_get_cmd_param(params, 0)->val_ul); } =20 - cpu =3D gdb_get_first_cpu_in_process(process); - if (!cpu) { - goto cleanup; + if (process) { + cpu =3D gdb_get_first_cpu_in_process(process); } =20 - process->attached =3D true; - gdbserver_state.g_cpu =3D cpu; - gdbserver_state.c_cpu =3D cpu; + if (cpu) { + process->attached =3D true; + gdbserver_state.g_cpu =3D cpu; + gdbserver_state.c_cpu =3D cpu; =20 - if (gdbserver_state.allow_stop_reply) { - g_string_printf(gdbserver_state.str_buf, "T%02xthread:", GDB_SIGNA= L_TRAP); - gdb_append_thread_id(cpu, gdbserver_state.str_buf); - g_string_append_c(gdbserver_state.str_buf, ';'); - gdbserver_state.allow_stop_reply =3D false; -cleanup: - gdb_put_strbuf(); + if (gdbserver_state.allow_stop_reply) { + g_string_printf(gdbserver_state.str_buf, "T%02xthread:", GDB_S= IGNAL_TRAP); + gdb_append_thread_id(cpu, gdbserver_state.str_buf); + g_string_append_c(gdbserver_state.str_buf, ';'); + gdbserver_state.allow_stop_reply =3D false; + } } + + gdb_put_strbuf(); } =20 static void handle_v_kill(GArray *params, void *user_ctx) --=20 2.47.3