From patchwork Mon Apr 15 18:53:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 88511 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EAA703846013 for ; Mon, 15 Apr 2024 18:54:14 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by sourceware.org (Postfix) with ESMTPS id 1AC7E385840E for ; Mon, 15 Apr 2024 18:53:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1AC7E385840E Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1AC7E385840E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d30 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713207231; cv=none; b=lSEgOuLAe7+L7EkXF8dPb42ZuedtHTX996IeXyPc032SGtwyPspRwoTNmAIPvw8vri+cyb5kFab+UOCyXPyJmvqDTDcVXjcb9ff8rtMw+WP4pIT7bj111GXxuaCLTXQDzIzwE+P1P3GxmNFBGGCPhCeEFaj5v/NBI6bdI5UiSs8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713207231; c=relaxed/simple; bh=c6o6DEJv+LFM1lu5ViqQSTR2zrtZHTv1y807/WU2Imc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=q183rG2RJx8xdduWWJRvRqsKWcALMpypbdld5otOye7Rt75CgtSY+af+K9NciibvSPEWO7/dcnlRpeaN+tf0CKy1aL6V6wEMffczVGRpoJ0LjruLoAzwkpSAl5Gow40gCLj66ePNkxxyT6ck6HT5q8nltVtMLa599MsMR6eg+zA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7d5facf3161so141972239f.1 for ; Mon, 15 Apr 2024 11:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1713207229; x=1713812029; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0xVbeKHVm0Y4863A4zFESF2SW8KX2VnJ/XqBaCm2yjE=; b=RRNmBNuVBSM3PrOK0rqXJQar+WMKCdc4Mu4/ETh042lFPTAmbbKQoU1tObqSVLWmWA fsIXJZ1SGMOf0fztd0YPVViyB1jegHT4kHQuZ31V3wYeZFJT1KTnO30QUtXOk4N1Oage J+N86bHkocMD+/xyP9qQbOrpsDJi3rYUB1YKz/4szLDvKa3cuy5dS0UURqBVhsspEffD sq0QCjPcq6Avi+eRzMl5rpiazSOAtJpWFM3YD+gc3BSHn9f4Mm38hictKbMNuvFSHmjv lctF5BZtAgPQpKXxBB6ZDSkuc8XqG1QKSAPSmzVOBuyPMY9WraSIuncM+XBrdnUHgAUj kedw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713207229; x=1713812029; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0xVbeKHVm0Y4863A4zFESF2SW8KX2VnJ/XqBaCm2yjE=; b=r75XHhBWt4Z6bJSVfneaClyoPz2vChlaafH8OX1RRU59TT5G/JvH6LiuxuI2ujxyZ0 RyISgQC63YpCEBVdRHNiK5VD1ulDPJSdDuWSGv8Y05bYMc+bvYItvsysO4GZTyt74d8C qWrXDKkZOO3GXzPfQ5Tu8sQVQXKc1zYDyhoqlTe73tCBFSBjBcUQuoxZWz7oeZMpjDa+ DvZK0jYvDQ7wj+KjUPW0zrDodrzGkF9O1EK5pZyU9AB/mKeWkbODnDzLOW0AoeW70iho UuVSuv2QcnvFXAFsoNUKacuWtVatmMK3I2Kg9P0clpcbKBXMCFVUr2SY/NuLHJw8zf45 I6/A== X-Gm-Message-State: AOJu0YwI/OqU8O8t4Xk8FuQTkYugVufuRqLF8LCVJiJd1UGIDwbpiUJH VBeJ+c3hTnV3aTIYMFt8dtMMmxNv1vglzMVVBUabYgbMDKePJQ5UdMOrZraxMvFjKQccDVclgNI = X-Google-Smtp-Source: AGHT+IE9DLzT3NE3nUxJNQ0z20l4AH4/K5Ygvug/5ndhML2v1v86L0Hpl3wpLQKS1bQX4kzKR2YmQw== X-Received: by 2002:a05:6602:29a2:b0:7d5:de55:a6c4 with SMTP id u2-20020a05660229a200b007d5de55a6c4mr14631882ios.4.1713207229268; Mon, 15 Apr 2024 11:53:49 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id n19-20020a05663831d300b00482b12a0776sm3355060jav.27.2024.04.15.11.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 11:53:49 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Fix crash in gdb_rl_callback_handler Date: Mon, 15 Apr 2024 12:53:38 -0600 Message-ID: <20240415185338.3904592-1-tromey@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org commit bdcd50f9 ("Strip trailing newlines from input string") introduced a crash in eof-exit.exp. This patch fixes the problem by adding a NULL check in the appropriate spot. Regression tested on x86-64 Fedora 38. I'm checking this in. --- gdb/event-top.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb/event-top.c b/gdb/event-top.c index f0c07ba7f64..6a2a75fe3dc 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -254,10 +254,13 @@ gdb_rl_callback_handler (char *rl) noexcept /* In bracketed paste mode, pasting a complete line can result in a literal newline appearing at the end of LINE. However, we never want this in gdb. */ - size_t len = strlen (rl); - while (len > 0 && (rl[len - 1] == '\r' || rl[len - 1] == '\n')) - --len; - rl[len] = '\0'; + if (rl != nullptr) + { + size_t len = strlen (rl); + while (len > 0 && (rl[len - 1] == '\r' || rl[len - 1] == '\n')) + --len; + rl[len] = '\0'; + } try {