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 3D538385EC09 for ; Mon, 21 Mar 2022 17:04:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3D538385EC09 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 h189so189613wmh.3 for ; Mon, 21 Mar 2022 10:04:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:from:to:references:in-reply-to :content-transfer-encoding; bh=o5gQBFbLj5DLWLL6umAaaNbOipOINCTDG/9LoFVw3U0=; b=1i+zeSGlcCP27b2CvPtHjDB81HTGRcmf+Spb1I6e+kLRdlxuKmI2O4D1gxDm3T7qf+ MpBj36pTi1WJOhONGAvE4x+SuJmR8qLzo1ObVS+1BD5iegAp/eWW8KwuPmINGESVQMl9 s5pDP9/W/L/6q+V5y8CCeHaxlNsJdpLpH7h8VkyBrpyWIjZvuxRhY7EL53c17I8FEwBm 6pWvq2EIQddFQEGjnN5Yoqi3CX45jDvEA5I9qPyORW4TTU8bCh8bXnJKq8pWzMM0B1i3 82w1hLnZD7iD0iWtRBo7BShPSh+68908FkSjBbMd0vUpGkkCItISD5lzQOW2X3uC4sTk Zh2w== X-Gm-Message-State: AOAM533zxmr5yTmSw2T+WCZ5JvxTwKjbKCkZWTsO9YOM1LGJvkNkEchG XJAMQ1nfLanncsGuKiilBiHNuTOgVAs= X-Google-Smtp-Source: ABdhPJzzvNDLvdsWXmhoVlUW/g8vnD9tFZMtCrTRHHP9qPsNcvDlSLgHRYQKw3ZFo32Zsn5mVSY+FQ== X-Received: by 2002:a1c:cc06:0:b0:389:79c7:aee6 with SMTP id h6-20020a1ccc06000000b0038979c7aee6mr43793wmb.47.1647882246730; Mon, 21 Mar 2022 10:04:06 -0700 (PDT) Received: from ?IPV6:2001:8a0:f924:2600:209d:85e2:409e:8726? ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id i15-20020adffdcf000000b00203efad1d89sm15621188wrs.9.2022.03.21.10.04.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Mar 2022 10:04:06 -0700 (PDT) Message-ID: <1769096a-48a6-f85a-436c-c9826a729933@palves.net> Date: Mon, 21 Mar 2022 17:04:05 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [pushed] gdbserver: Fixup previous patch Content-Language: en-US From: Pedro Alves To: gdb-patches@sourceware.org References: <20220321164840.2073311-1-pedro@palves.net> In-Reply-To: <20220321164840.2073311-1-pedro@palves.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-9.7 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 17:04:09 -0000 On 2022-03-21 16:48, Pedro Alves wrote: > @@ -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; > } > Whoops, the '*buf = 'S';' line is also incorrect, of course. Fixed by this follow up patch. Pushed to master. >From 4414150d33212f5f395c3bf8a940bccf80ffc508 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 21 Mar 2022 16:58:23 +0000 Subject: [PATCH] gdbserver: Fixup previous patch The previous prepare_resume_reply change missed updating the 'buf' reference that overwrites the 'T', so if 'buf' was advanced, we'd still overwrite the wrong character. This fixes it. Change-Id: Ia8ce433366b85af4e268c1c49e7b447da3130a4d --- gdbserver/remote-utils.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc index 0599cc9c4f1..db9b2a66f3c 100644 --- a/gdbserver/remote-utils.cc +++ b/gdbserver/remote-utils.cc @@ -1144,7 +1144,7 @@ prepare_resume_reply (char *buf, ptid_t ptid, const target_waitstatus &status) gdb_assert (buf_start[0] == 'T'); gdb_assert (isxdigit (buf_start[1])); gdb_assert (isxdigit (buf_start[2])); - *buf = 'S'; + buf_start[0] = 'S'; buf_start[3] = '\0'; break; } base-commit: 04f0c03a22135c7eefa47ed99c03e5b3dc9a34e2 -- 2.26.2