From patchwork Thu Oct 24 00:24:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 13848137 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D61279CD for ; Thu, 24 Oct 2024 00:25:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729729505; cv=none; b=adjjoDoz3/02YbtaOk25LYaqBXnEvTWcJr2QWywTuOsBG7iKpxSXEGBem+gCOs9FGcFCwCezIiR6+qqDVDnuI54slJI8ZriK5YFhd+7YSDE50AIHujqIcoX/+7ti38YD8Z+mNCPMSeu6yOTGXSEfVcyF35LMTRNBekZKlIrj0Og= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729729505; c=relaxed/simple; bh=ODO9ScfDkfM0XW0YykHJlR5+CsRtXGN/2dxCnZgwxyQ=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=Zpvb82aNovWIQgZcjt0FnQI6r74qR/PEMblT1ElsFFGtkU/EcX3sRtt138M0SbKZvkVduSunDAIFmjzY7qsMgp4MK0P6xINIBIXJz9ZUM4vGuWj/B4W0NCCGoEVfUIdEB5lKdNlawRnkAAMeksU6+0VWBeHk10L7ASgs3m+UnoU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K/vLxYn4; arc=none smtp.client-ip=209.85.208.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K/vLxYn4" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2fabb837ddbso4572461fa.1 for ; Wed, 23 Oct 2024 17:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729729501; x=1730334301; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=5tijPZD14nHygSw5Uu1jf8sqx//yURjke4twtsvHYB8=; b=K/vLxYn42aZug6Bx8/KQE4Lt2c/TxJp03bUn8G2yC7q0jFbVf6ClzF4ksGD/PUIGbW X4/aUccN9TCbdaYHd8gs5XpPKI3WPp0pVEVeHrb1lnmAOzvnSmYDgWyUFqQO+2sQf9+f 8pgOFpaZfSqGnz9v9BByO9fc+5+gpsD1oGlWLZeFWya0/HoH6CSrksy/oIf3EPS0wz8h Ow9li7eibui/FTv3xHHG/SAp/21FXNVMGd7OKITuh2BcGnWu/q/d0dyuBWjR9j4k7rZf L2Goq1PxnGEvk52n84x9KRR/kOUTwQ6n6pU8fF004dNdRfex487KwdQZVIjIY5cb1GIC EDqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729729501; x=1730334301; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5tijPZD14nHygSw5Uu1jf8sqx//yURjke4twtsvHYB8=; b=cSXH0d73DyfexXn4pG2KuWg4OltYYKavwxny20EC1f+uJ8PXfCwHYH/UH0TlDMlsko Ok8axYFNx2JN4oOQqKx1jioRSxSBK9+dnGH6XIVH80TejmBjFU9tbQZlul1ZLaj5tPXL bzrIWmXgrpsDOVIP7QLeSH6IyassBjvz1yiLC73LzRSyEBquJi4zkZWRmQdBRDdsR5c0 pd6gUqKyHvdCS6pIafd3XkvT4BHBPv90OFW/7MkNfeIbhNnIRNXqm5C1gGv0dmM4J7jS LZJb+FwS7lXJKPO5nVMuuQtSOOxUzEinlCOucSgJaaAo8IzeJOTPh5rZOcb75c1SIV7x KW0g== X-Gm-Message-State: AOJu0YyYwWEzK3tc3wgtmHqyoPe9+vyCGyNHa1cSic63u0o4pfPznVpv /sbxAelXdsmWoh5UTwnaCSSM7VMYTSdqCBG3dU2HbSMBCG03BZOfXA8Psg== X-Google-Smtp-Source: AGHT+IEKb2yrkvKLyD3Tt+bnEN0DeyftrqG6JP0vg4J0VvDRNtbuCQNenOWAZDh/Pxim54AvokMyCQ== X-Received: by 2002:a05:6512:1282:b0:533:4785:82ab with SMTP id 2adb3069b0e04-53b1a315e50mr4266770e87.1.1729729501107; Wed, 23 Oct 2024 17:25:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9a91370fe5sm537397866b.112.2024.10.23.17.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 17:25:00 -0700 (PDT) Message-Id: <3daedaeb260eee873c525fbfad5838c933e1e8e5.1729729499.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 24 Oct 2024 00:24:56 +0000 Subject: [PATCH v6 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Taylor Blau , Patrick Steinhardt , Usman Akinyemi , Usman Akinyemi From: Usman Akinyemi From: Usman Akinyemi Replace atoi() with strtoul_ui() for --timeout and --init-timeout (non-negative integers) and with strtol_i() for --max-connections (signed integers). This improves error handling and input validation by detecting invalid values and providing clear error messages. Update tests to ensure these arguments are properly validated. Signed-off-by: Usman Akinyemi --- daemon.c | 12 ++++++++---- t/t5570-git-daemon.sh | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/daemon.c b/daemon.c index cb946e3c95f..a40e435c637 100644 --- a/daemon.c +++ b/daemon.c @@ -4,6 +4,7 @@ #include "abspath.h" #include "config.h" #include "environment.h" +#include "gettext.h" #include "path.h" #include "pkt-line.h" #include "protocol.h" @@ -1308,17 +1309,20 @@ int cmd_main(int argc, const char **argv) continue; } if (skip_prefix(arg, "--timeout=", &v)) { - timeout = atoi(v); + if (strtoul_ui(v, 10, &timeout)) + die(_("invalid timeout '%s', expecting a non-negative integer"), v); continue; } if (skip_prefix(arg, "--init-timeout=", &v)) { - init_timeout = atoi(v); + if (strtoul_ui(v, 10, &init_timeout)) + die(_("invalid init-timeout '%s', expecting a non-negative integer"), v); continue; } if (skip_prefix(arg, "--max-connections=", &v)) { - max_connections = atoi(v); + if (strtol_i(v, 10, &max_connections)) + die(_("invalid max-connections '%s', expecting an integer"), v); if (max_connections < 0) - max_connections = 0; /* unlimited */ + max_connections = 0; /* unlimited */ continue; } if (!strcmp(arg, "--strict-paths")) { diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index c5f08b67996..e3df7d86410 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -8,6 +8,31 @@ TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh . "$TEST_DIRECTORY"/lib-git-daemon.sh + +test_expect_success 'daemon rejects invalid --init-timeout values' ' + for arg in "3a" "-3" + do + test_must_fail git daemon --init-timeout="$arg" 2>err && + test_grep "fatal: invalid init-timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err || + return 1 + done +' + +test_expect_success 'daemon rejects invalid --timeout values' ' + for arg in "3a" "-3" + do + test_must_fail git daemon --timeout="$arg" 2>err && + test_grep "fatal: invalid timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err || + return 1 + done +' + +test_expect_success 'daemon rejects invalid --max-connections values' ' + arg='3a' && + test_must_fail git daemon --max-connections=3a 2>err && + test_grep "fatal: invalid max-connections ${SQ}$arg${SQ}, expecting an integer" err +' + start_git_daemon check_verbose_connect () { From patchwork Thu Oct 24 00:24:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 13848138 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D0CF848C for ; Thu, 24 Oct 2024 00:25:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729729506; cv=none; b=LIhU+43QKzTDCLF0SE4A4tXDZ1QgW6IDiNb1q7rQF8A2lq3F+/Ub8B+jfzpts4/zK7p5xOEfohYMC8lvk2XzWJO1I/jxatDiBHOzcqV/5E2ogZkWtOrOkOwryHOHpTcTsVnLfnFacBW6470cyr4+cW3fzoKS29vTxO9MugrPnj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729729506; c=relaxed/simple; bh=o/XE6+R7b+USfapim0RE9o/+CifsLG2QGh9qfsSo8Ck=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=HP9PwllcPTRor2u4Z7RT7k1ITW2015IZre4cZYEUTH4jTNE+3f+M4QEisgvrbPV3oz4c87PshNkX1Q4WLQ4x7S736ov3BSlWrBJ8MDCsNwwJgPXzS/48NntVBlbsYQwrjwOxAJIXPj13AK8y+aWRYO3Nnnn77APsYuZcO0Ms+Ng= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=geoFsOyW; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="geoFsOyW" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-a99eb8b607aso26962366b.2 for ; Wed, 23 Oct 2024 17:25:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729729502; x=1730334302; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Z4GPchkQpAaGooAKo0wkCv/IUL9dpaN5Lh71nlKAT0A=; b=geoFsOyWUd+GGSor9/9mzOSnKTBWzc6iy8khYHLQjc2ruFn7NiOhcBZD1kh/VyfjZF cWh0iMqIxGtknvDG8GIhgP1V2Y+w7tZgeD31EcnwRBGo2Jfyqz7EcHSsSXEZhbYjPaAw oNTiR1LeiODVu45xS0Z8Xhab5NcEOiHXC/7akbz+UnetbfStWoOpazkJpMbOwfgU6VV5 PN9GL7vwrQR5ZcNUvJUmCi144TOUWVzrYe0iGOX1rgo5VfDH5Dvw1jPDco21qLjLmZxf OWnNq6adzCyIiRBEMJ871FOLF25yANrfSPJbBUPLPUHDQAL2hxVCIyWB/lCs9XSDqTgF 2q9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729729502; x=1730334302; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z4GPchkQpAaGooAKo0wkCv/IUL9dpaN5Lh71nlKAT0A=; b=ahbrEV2pMuehCxwbpoNDfph9eq4btKRmqiW06jl49HPPGr85IQGNsY9ra1yrSMEmGs 3TP0unQlo9Dv1Ujg1RiZ9I466CIhkkwy9uCtJ1K4y3Qye19ngLsxs2I9Swt5/v94F8VC wP+qOZszhFjuXtAB4chm/rFySR8T1oAUAs1680hS/ESpBkCEn7ge3nneRfo+mJgyjNFl 0p7iLpNh6K5zWix9rajHSHmv7o1/r8pw2ItqsrW23W2iK20kwi/Suc8pIrKOToAYemA3 jo6c8f53gYB+GCsb/tS7NVcDSa7PvDsLYSCVhxiRfVMlbRtsASTwVGRfhPPw4lZYtytz t/QQ== X-Gm-Message-State: AOJu0Yw/EStWYmJY0fcdfASDFvdT4bke1oIkofbUd8mapcIZW6cfZEBO TIxuxqmm5mCk0EBDYnMkENOQyj7U39zdkY8meG8OaMl+0/lMrcjPE0+15A== X-Google-Smtp-Source: AGHT+IHWuRUlNBNAvyG0heD0zWVB8zKsmiW9YBPObCFMRtckjRNzec6VnfwLRwT3iXMR2EcimnlIHw== X-Received: by 2002:a17:906:da8e:b0:a9a:1e4d:856d with SMTP id a640c23a62f3a-a9ad273096bmr9252166b.22.1729729501890; Wed, 23 Oct 2024 17:25:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9a91306fc0sm539396866b.91.2024.10.23.17.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 17:25:01 -0700 (PDT) Message-Id: <0ea3b3495609deef8942899b960756d9cab6e25d.1729729499.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 24 Oct 2024 00:24:57 +0000 Subject: [PATCH v6 2/3] merge: replace atoi() with strtol_i() for marker size validation Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Taylor Blau , Patrick Steinhardt , Usman Akinyemi , Usman Akinyemi From: Usman Akinyemi From: Usman Akinyemi Replace atoi() with strtol_i() for parsing conflict-marker-size to improve error handling. Invalid values, such as those containing letters now trigger a clear error message. Update the test to verify invalid input handling. Signed-off-by: Usman Akinyemi --- merge-ll.c | 11 +++++++++-- t/t6406-merge-attr.sh | 8 ++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/merge-ll.c b/merge-ll.c index 8e63071922b..62fc625552d 100644 --- a/merge-ll.c +++ b/merge-ll.c @@ -15,6 +15,7 @@ #include "merge-ll.h" #include "quote.h" #include "strbuf.h" +#include "gettext.h" struct ll_merge_driver; @@ -427,7 +428,10 @@ enum ll_merge_result ll_merge(mmbuffer_t *result_buf, git_check_attr(istate, path, check); ll_driver_name = check->items[0].value; if (check->items[1].value) { - marker_size = atoi(check->items[1].value); + if (strtol_i(check->items[1].value, 10, &marker_size)) { + marker_size = DEFAULT_CONFLICT_MARKER_SIZE; + warning(_("invalid marker-size '%s', expecting an integer"), check->items[1].value); + } if (marker_size <= 0) marker_size = DEFAULT_CONFLICT_MARKER_SIZE; } @@ -454,7 +458,10 @@ int ll_merge_marker_size(struct index_state *istate, const char *path) check = attr_check_initl("conflict-marker-size", NULL); git_check_attr(istate, path, check); if (check->items[0].value) { - marker_size = atoi(check->items[0].value); + if (strtol_i(check->items[0].value, 10, &marker_size)) { + marker_size = DEFAULT_CONFLICT_MARKER_SIZE; + warning(_("invalid marker-size '%s', expecting an integer"), check->items[0].value); + } if (marker_size <= 0) marker_size = DEFAULT_CONFLICT_MARKER_SIZE; } diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh index 9bf95249347..2dfc9a873d4 100755 --- a/t/t6406-merge-attr.sh +++ b/t/t6406-merge-attr.sh @@ -118,6 +118,14 @@ test_expect_success 'retry the merge with longer context' ' grep "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" actual ' +test_expect_success 'invalid conflict-marker-size 3a' ' + cp .gitattributes .gitattributes.bak && + echo "text conflict-marker-size=3a" >>.gitattributes && + test_when_finished "mv .gitattributes.bak .gitattributes" && + git checkout -m text 2>err && + test_grep "warning: invalid marker-size ${SQ}3a${SQ}, expecting an integer" err +' + test_expect_success 'custom merge backend' ' echo "* merge=union" >.gitattributes && From patchwork Thu Oct 24 00:24:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 13848139 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D31E38493 for ; Thu, 24 Oct 2024 00:25:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729729506; cv=none; b=RC/1/+1n28lxabOHoDWamL3vSNajPG5YsAdQyo0GDLecsAPPSCIQ7AvbjB3kvG7q7NCELRDGesqHY7aFqU+3MLYuEec7HcxtJQdqvSfJELOC/hmsnRKE/KLbl7ZJoPEVSdXGT8ImhcEG5/dVfpL/p+yZur0XAAms+enAo+osLqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729729506; c=relaxed/simple; bh=+m7C0CcNl2NR3KoZZfHWLylLpvi2YgM1K5aK6Fqwk/g=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=BXlm2ubFcNjg755jZ7zgXC92LaB5sqWVW6q5bMGXZ3gbiBEZi4T8ahNSyqxl3Ktp8P+IKYY8O1179E6QhERMNF7p+m+81VgsGACISN+ycQqkM2uyX3itYUcQEfhqdO9RNmBFKL9Sdz+Y+so94dFAlDxVq6Bn2NCwnNTO6XQY8Gc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bGrYdUOj; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bGrYdUOj" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5cb72918bddso417325a12.3 for ; Wed, 23 Oct 2024 17:25:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729729503; x=1730334303; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=4Rzv7AnOxuQovJ9pw7+5rvDkRMri4p78w2Bp8gd0vNA=; b=bGrYdUOjx58BcFuZ8rvUjHS2pOv05oQvbKyVyDfeF8o4YbH4oPfSpDMvRM+dcd6Y1d XBOUFIDXvqMIfji5v50TBcBZ7zsUfQZIGggPCWEPSPv5fLXAVzJ8yB8Za3Va99MUvCAr sfI7UrN+y1eS8LVQG92sVAwaUxAf+E3cLkjpEWw5iHlyrVRLPCOFMlUXyC0fsgAwh6Rq v7rQg+0EuzOkgFiX4uBOCy7GivSLkdIxVTdeFzuMcgR+BE7RYQ7yBwLCL/dg2nTEB38r Bs4RGBuZsf4HOkBWKuCUj4QtOUoMJ4/IJri3rPrjvnP6SViwdZ50YW5lugoWXiixy9c6 vpOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729729503; x=1730334303; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4Rzv7AnOxuQovJ9pw7+5rvDkRMri4p78w2Bp8gd0vNA=; b=pLIJ7DikGhbWvf/B7Ia/GmuiTFxpFWt7wn90mrEoPY4Fk8NrdMysOu8o7tGQ5SIlIq XoBkcbxrpLZgSUWxCKAbOzw6t+LJzTgzXERJrH4aWyA1QILttxiARt3iOl79GLFtHjlx 0lEFQtCKSZMhz3aAjIGG60hhBLulZ5TlCuLkp9rOQe+jXfojbCt7NBJCu4q4FRDt+ayb 0lG6blQKpVVyf2hWOqfLA16bf+to/hhy7iSRvfieZNgYJUh5TIjV/69clHz5zNYGon2F lN6qgYXkBNPzgFEqTRr5U8lfvPF1kMfAhbJd6YzMWZi4QXjJS09Bun3eNpf8tqU5vPYG fksA== X-Gm-Message-State: AOJu0Ywa5nKvVEo4dlVfaDDJ4blpVuDqjpEcGSgw+fOlYT9tMHBYdzSS lQM07F95EoHRvFdNuWEOskaLuhifBMMTde0K6JISt8mArS/tYpa03dU8Pg== X-Google-Smtp-Source: AGHT+IHfZ/na2fJ4f5eVkUP/RAW0gBFCgTrH7TlQwIJ80oJfLqKoErRSCDQR6k7/T59GX0glX3xL8g== X-Received: by 2002:a05:6402:254d:b0:5c9:4281:4515 with SMTP id 4fb4d7f45d1cf-5cb8acb7b0amr3803671a12.17.1729729502632; Wed, 23 Oct 2024 17:25:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66a6a555sm5031724a12.45.2024.10.23.17.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 17:25:02 -0700 (PDT) Message-Id: <17484df5200356c9cc17cde293e501a5a88a744a.1729729499.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 24 Oct 2024 00:24:58 +0000 Subject: [PATCH v6 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Taylor Blau , Patrick Steinhardt , Usman Akinyemi , Usman Akinyemi From: Usman Akinyemi From: Usman Akinyemi Replace unsafe uses of atoi() with strtol_i() to improve error handling when parsing UIDVALIDITY, UIDNEXT, and APPENDUID in IMAP commands. Invalid values, such as those with letters, now trigger error messages and prevent malformed status responses. I did not add any test for this commit as we do not have any test for git-imap-send(1) at this point. Signed-off-by: Usman Akinyemi --- imap-send.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/imap-send.c b/imap-send.c index ec68a066877..488c06e6139 100644 --- a/imap-send.c +++ b/imap-send.c @@ -668,12 +668,12 @@ static int parse_response_code(struct imap_store *ctx, struct imap_cmd_cb *cb, return RESP_BAD; } if (!strcmp("UIDVALIDITY", arg)) { - if (!(arg = next_arg(&s)) || !(ctx->uidvalidity = atoi(arg))) { + if (!(arg = next_arg(&s)) || strtol_i(arg, 10, &ctx->uidvalidity) || !ctx->uidvalidity) { fprintf(stderr, "IMAP error: malformed UIDVALIDITY status\n"); return RESP_BAD; } } else if (!strcmp("UIDNEXT", arg)) { - if (!(arg = next_arg(&s)) || !(imap->uidnext = atoi(arg))) { + if (!(arg = next_arg(&s)) || strtol_i(arg, 10, &imap->uidnext) || !imap->uidnext) { fprintf(stderr, "IMAP error: malformed NEXTUID status\n"); return RESP_BAD; } @@ -686,8 +686,8 @@ static int parse_response_code(struct imap_store *ctx, struct imap_cmd_cb *cb, for (; isspace((unsigned char)*p); p++); fprintf(stderr, "*** IMAP ALERT *** %s\n", p); } else if (cb && cb->ctx && !strcmp("APPENDUID", arg)) { - if (!(arg = next_arg(&s)) || !(ctx->uidvalidity = atoi(arg)) || - !(arg = next_arg(&s)) || !(*(int *)cb->ctx = atoi(arg))) { + if (!(arg = next_arg(&s)) || strtol_i(arg, 10, &ctx->uidvalidity) || !ctx->uidvalidity || + !(arg = next_arg(&s)) || strtol_i(arg, 10, (int *)cb->ctx) || !cb->ctx) { fprintf(stderr, "IMAP error: malformed APPENDUID status\n"); return RESP_BAD; } @@ -773,7 +773,10 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd) if (!tcmd) return DRV_OK; } else { - tag = atoi(arg); + if (strtol_i(arg, 10, &tag)) { + fprintf(stderr, "IMAP error: malformed tag %s\n", arg); + return RESP_BAD; + } for (pcmdp = &imap->in_progress; (cmdp = *pcmdp); pcmdp = &cmdp->next) if (cmdp->tag == tag) goto gottag;