From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id A31133858C54 for ; Wed, 26 Apr 2023 16:18:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A31133858C54 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DD0231FDD1; Wed, 26 Apr 2023 16:18:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682525924; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CcPwubuifd6GBTQt1Er5hD01N69hlmfjFTacF0cnf+s=; b=XPxBbqNiQvowY+/YwG23OD/ANZITQ3TrnUhOZCNrzvJlLQG5oosffpoUkq72BwyTXGdqnI ZY8CLg0LeVr5nAzTa23agrdbDJKdvAbbxqm5MIgRzyXq/xTZveBHJmdk3hx8dy4j7L8UBe UNMoBrJiYxKUM4AYw+Tl4aqz38oJ4C0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682525924; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CcPwubuifd6GBTQt1Er5hD01N69hlmfjFTacF0cnf+s=; b=5BOg+u20/adk0wRM8Yet6KvMlJITRuViAOHYw4SHwj48+wJzvE8opw6N4esvHlbk1yz9Ou sNA/buyko69cWKBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BFD4C138F0; Wed, 26 Apr 2023 16:18:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 5163LeROSWS5IQAAMHmgww (envelope-from ); Wed, 26 Apr 2023 16:18:44 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Simon Marchi , Tom Tromey Subject: [pushed] [gdb/tui] Fix length of status line string Date: Wed, 26 Apr 2023 18:18:51 +0200 Message-Id: <20230426161851.14215-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: In commit 5d10a2041eb ("gdb: add string_file::release method") this was added: ... + std::string string_val = string.release (); ... without updating subsequent uses of string.size (), which returns 0 after the string.release () call. Fix this by: - using string_val.size () instead of string.size (), and - adding an assert that would have caught this regression. Tested on x86_64-linux. Reviewed-By: Simon Marchi PR tui/30389 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30389 --- gdb/tui/tui-stack.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index 0a750187c26..76b8f066abb 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -183,10 +183,13 @@ tui_locator_window::make_status_line () const std::string string_val = string.release (); - if (string.size () < status_size) - string_val.append (status_size - string.size (), ' '); - else if (string.size () > status_size) - string_val.erase (status_size, string.size ()); + size_t len = string_val.size (); + if (len < status_size) + string_val.append (status_size - len, ' '); + else if (len > status_size) + string_val.erase (status_size, len); + + gdb_assert (string_val.size () == status_size); return string_val; } base-commit: 3ad6c165ca098a0fa4491893a75b4b1581698484 -- 2.35.3