From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by sourceware.org (Postfix) with ESMTPS id 3085A3857404 for ; Mon, 21 Mar 2022 16:48:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3085A3857404 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f42.google.com with SMTP id k124-20020a1ca182000000b0038c9cf6e2a6so2628198wme.0 for ; Mon, 21 Mar 2022 09:48:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=FD8O1TQ+lr+b1cRaC/0UxcFSS15vZHrgV4vNvcJw9L8=; b=gKK/oWrKyQJyWuvEu5MHN0tSKbKHWZrKpnqYOyFJqKzIZfTQ/qIknIqlZApsNpHjx8 MlPfqwxVUQtl17XDSMv9BPCJ/jQPq4eIllO96IApUMSWdgwxGBRquf/6dhADdGwe036w 4H/yr7TNrluxxobWKwOdnz8tPjbFVBZUtnbRMw8puSy5qQA54R7LT3GFJm8BEjxS1JyW 9k6CKoJINKhrZrWjgxKwcZR5aT1qATKNt2+Zs5wfsuzxKjC+QPJ1j1OlKPRGEoU3Yqr+ gQhfM2rX8x7i3rCU3nzJCH+S1FpSPH3JEaL7Pl8BHXI4kCxcbEuVM/DYkUtps4QN8NSO ft6g== X-Gm-Message-State: AOAM530DjOnm791SlG3lbgRuOa5FmZEI1NilNhZcoxSdo6fvuByC4JCo EVr+eU7QyZ7A+SHVEvkuBdSJh86k9Xs= X-Google-Smtp-Source: ABdhPJxN0u+I7Ie1yp77i2lnWwzmJl8t/IxWwFX3KUuUuUYhLrgL+U9XxRxiT/eFMWbTnaqrofdJdA== X-Received: by 2002:a05:600c:4611:b0:389:9f47:30cd with SMTP id m17-20020a05600c461100b003899f4730cdmr19892078wmo.185.1647881322493; Mon, 21 Mar 2022 09:48:42 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id f22-20020a1cc916000000b00380d3e49e89sm23829wmb.22.2022.03.21.09.48.41 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Mar 2022 09:48:41 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [ob/pushed] gdbserver: Fix incorrect assertion Date: Mon, 21 Mar 2022 16:48:40 +0000 Message-Id: <20220321164840.2073311-1-pedro@palves.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2022 16:48:45 -0000 While playing with adding a new event kind, I noticed that prepare_resume_reply TARGET_WAITKIND_FORKED, etc. advance 'buf', so if we force-disable the T packet, we'd fail the *buf == 'T' assertion. Fix it by tweaking the assertion to always look at the beginning of the buffer. Change-Id: I8c38e32353db115edcde418b3b1e8ba12343c22b --- gdbserver/remote-utils.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc index 3004130fb25..0599cc9c4f1 100644 --- a/gdbserver/remote-utils.cc +++ b/gdbserver/remote-utils.cc @@ -1070,6 +1070,7 @@ prepare_resume_reply (char *buf, ptid_t ptid, const target_waitstatus &status) { const char **regp; struct regcache *regcache; + char *buf_start = buf; if ((status.kind () == TARGET_WAITKIND_FORKED && cs.report_fork_events) || (status.kind () == TARGET_WAITKIND_VFORKED @@ -1140,11 +1141,11 @@ prepare_resume_reply (char *buf, ptid_t ptid, const target_waitstatus &status) An 'S' stop packet always looks like 'Sxx', so all we do here is convert the buffer from a T packet to an S packet and the avoid adding any extra content by breaking out. */ - gdb_assert (*buf == 'T'); - gdb_assert (isxdigit (*(buf + 1))); - gdb_assert (isxdigit (*(buf + 2))); + gdb_assert (buf_start[0] == 'T'); + gdb_assert (isxdigit (buf_start[1])); + gdb_assert (isxdigit (buf_start[2])); *buf = 'S'; - *(buf + 3) = '\0'; + buf_start[3] = '\0'; break; } base-commit: f55649cc9bcb92405d49af6bdcde6e69ac4d1c49 -- 2.26.2