From patchwork Mon Jan 22 08:51:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohit Marathe X-Patchwork-Id: 13524959 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 8F8E139846 for ; Mon, 22 Jan 2024 08:52:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705913525; cv=none; b=n8W8n4e879uhvXmPb9BlhGpZZd/+5DRHz7P1Zy+HH+fZAxNv25IUsLZTz4I7BEjImLCgZWG82Z/j0QGynbwtj4/e2M1PPo4XNhwHMyJPzmxpIomH+SsMdHXlOyFnvpPie1IUxApoKmslqptBcuT4lsDTqi/nPRaWpxJJG+fX+us= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705913525; c=relaxed/simple; bh=LvYpSpV/7iegJ8GtnkSkOKQohoM2V+p663yM5ZeMZR0=; h=Message-ID:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=t9DTcSiyO90HE0dPgZNnhTnVOBbFu2qAnckKN/W7BuMdD3dYSklfFpySAJkv7SQqHFEL/aPY6UXwZTZFP5g6+KmwnnQ+APrZe0820Va//KmUgnrWEpdXhe7MQfRrqi/LmiCzsHvNfadvtnbdcLOaMWgsbVTUJ2TjwvZnLWBkP2Y= 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=ZqPwr926; arc=none smtp.client-ip=209.85.128.51 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="ZqPwr926" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40eab3912d5so10024095e9.2 for ; Mon, 22 Jan 2024 00:52:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705913521; x=1706518321; 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=wEJ4Plhkr5M7OXZ1VH62B32jcDt6qZCiVQie0Se70rs=; b=ZqPwr926sf8QFI2ZNA6y4QMvziS1NLjhVnm52pFSunC7bkiuCizA/b0OI5JBZGNYNH s6hiGelLJtEXYK7drUoCimQxqehWCj890tTVOJhpMhmaHw/fEKXghjGE8xGiddsYAFaT psgyHtDiER8FwSUi4h1h9umO4tgrJiMaMBH3CUTWFHtGVkKNmzXeidvlK6eKFU74PzrR q/dKAjiI5u6Uvu0U2t38YzSvJPCmkqJ2pQxkwHzDackaXLqj2wDX+MPUrq7xSAsvmin6 lDIomtDAOjJ44oXPTIcZGeofdi5eQuBi9LnnYGtmkXcg2Y2ak9P0Q6xBy2f3puX20AIE d1WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705913521; x=1706518321; 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=wEJ4Plhkr5M7OXZ1VH62B32jcDt6qZCiVQie0Se70rs=; b=TahO6qD91EjP+wi2/h263l4B2Pz8KdXkt3jndXk4SQZHpaCP/jaY2bT32/GbrIMyhT Ns/JZh4YlHBodYDqw6brY3VHyMq4Gsu8PQOqS8pChAqDPW59PyubXuLX3rSo7liDxo3R 6OjgRQ0Vdv2QM+zLWJ5INtqiyxAA953gLftVlZMj+aCULJFnpy7oeAsFKh0xI+qNCB+A 85je1Ak9TMPqpkUSuQmJ98UE0dtkR9309r79MWh+bNb9+uvTVYJn5sFPLsytAf0bD1OO f4kuHPJrtUow65tXFA9qxlzm8Sknmbolf9dlzcNw/EUDsZRBkeBnzV3JFGysCDYIR+Kl PwHA== X-Gm-Message-State: AOJu0YzeTgR9bZJuQpdR87qr2dBSXMvXTAbUv+05stlhPMGbwOIO9epM K5+GkfyTJV7It3YkykloMT5rsUGl21vZBJtwe+I02U5XxZgP9dDjqZ8Zokdu X-Google-Smtp-Source: AGHT+IG2XKDv/xjiwb6r5qwGo7B7cRg4DfO3BzhUZMCmZYSdmZYE4tekLe2oTsXJjouCRb1KFeb6pw== X-Received: by 2002:a05:600c:4ecf:b0:40e:ab32:28ba with SMTP id g15-20020a05600c4ecf00b0040eab3228bamr1098489wmq.72.1705913521011; Mon, 22 Jan 2024 00:52:01 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v4-20020a05600c470400b0040e5945307esm38501970wmo.40.2024.01.22.00.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 00:52:00 -0800 (PST) Message-ID: <4e2b03cdd4f57d91f1993c5e89e28f9115033161.1705913519.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 22 Jan 2024 08:51:58 +0000 Subject: [PATCH 1/2] git-compat-util: add strtol_i2 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: Mohit Marathe , Mohit Marathe From: Mohit Marathe From: Mohit Marathe This function is an updated version of strtol_i function. It will give more control to handle parsing of the characters after the integer and better error handling while parsing numbers. Signed-off-by: Mohit Marathe --- git-compat-util.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h index 7c2a6538e5a..0a014c837d8 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1309,6 +1309,29 @@ static inline int strtol_i(char const *s, int base, int *result) return 0; } +#define strtol_i(s,b,r) strtol_i2((s), (b), (r), NULL) +static inline int strtol_i2(char const *s, int base, int *result, char **endp) +{ + long ul; + char *dummy = NULL; + + if (!endp) + endp = &dummy; + errno = 0; + ul = strtol(s, endp, base); + if (errno || + /* + * if we are told to parse to the end of the string by + * passing NULL to endp, it is an error to have any + * remaining character after the digits. + */ + (dummy && *dummy) || + *endp == s || (int) ul != ul) + return -1; + *result = ul; + return 0; +} + void git_stable_qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)); #ifdef INTERNAL_QSORT From patchwork Mon Jan 22 08:51:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohit Marathe X-Patchwork-Id: 13524960 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 3260C39ACD for ; Mon, 22 Jan 2024 08:52:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705913526; cv=none; b=Ck74cIzG6LmvuWDzIFCTmg/6k5VfKszU5xj4J0BJtOdKZLaONZgFeuE+FcEDlIjkqZNMduE+SczIwmGXkB39m7rpVvo1hiNIrfoZShA7tKLXb36GSigYPjM4SxBcIXnVue9N4W3lPWoXezyaygiG0PWsfz5qsQlFCO8tsRfyoU0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705913526; c=relaxed/simple; bh=RDlXLgjmyDk4H8dtoV/gITDi7dwzQh4uY4wPHNM4HUQ=; h=Message-ID:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=POg4zJRVmYO9p8dCvU30ClJ0BKkFmQaH7GgZi7j2D7YZHfhb0rJw+4ogs8rOg20sOyABMUeR/f48VUsCa8LBgjwPXr91i2gxossTfedMUYzM47yddEvf/+2IVkFoWaam9/LQ2C2ogZ3kv1IHMd2mM3lQndnG9/+diywyk7DVxzw= 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=YHeg8/Hq; arc=none smtp.client-ip=209.85.221.45 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="YHeg8/Hq" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-33934567777so937227f8f.1 for ; Mon, 22 Jan 2024 00:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705913523; x=1706518323; 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=mkozd3Lgt1REvxVaC0GAXuLlZuqltdDy5Eq8HXf/kfg=; b=YHeg8/HqgIK0XcdtHbYdTUXmgWl8Z4+BVw5Y+39Whprx/TRfBZlj6AbQ+hJar9PtKQ G1whHUUFyf0d2UfSN9Ilvg2Rwo2Y0vPJY4DozJDt+L60Dnr6XlfEA1/ddG+/Y/kPlEkI svmrxtmFbHzvv/fgyTHn72mtJ0A2sqQNHpekT0POlTqd9+lqJlXE85ztoceh8MTKcwQt njtY907vwfSQPjvZdWzuoBqgZFG7gkN6TLNpphlHEAt/jzdS1jCvlVWRTkEKa9s+Jlzu 2arzJ8NF7MaAj3t64lpJrYA3pzDdI8GYewGIGqeddNBPRZyPKYI1qdt80rKPXrMoOVrL y8vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705913523; x=1706518323; 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=mkozd3Lgt1REvxVaC0GAXuLlZuqltdDy5Eq8HXf/kfg=; b=GNTYXPbwZrX3rREQhFiP0fVfIUsadCVfDgKBUmxR25tq7EJWLWsE7IVIK8FH95lzyT YYIRGGGQ+NFc/PEfsXV32ivCjEpA4aTy8FUXBtmqEzUMWYR9b4evZl9DShD6ReKSYLLS d97gMB+CmO3wMxb/r60HRkX/sHh88SaB6jNkwFWIZMGafzTT3afDo9C4stznvPgaBdnf l/Bs1reRxRNu4qWK0LCGkyRoEnnvMoR69nDdrs0Q1I5yJv7ojz6iFVTVwZ/APPTbalSt hup+JX7L2LuoX40gEs3f4p06aXxfJLaazHoRMpR7hqfQUPzioc4jdbZDxCJ8TtO1ITCr +mKQ== X-Gm-Message-State: AOJu0Yz3O811BIl7q3vcW5gF7Hh0riRXxq5xG4y+YazjfIKicPT9l5ll GdVyD1ds/RnKO/D2STVao6z/tA5neC9CzAsYSy6jhbcrSVukUAAyE2VFOzZU X-Google-Smtp-Source: AGHT+IFxIpSy/V3L4ZyEgG9gg+K7ycPg4vtOmyaWjnTI3W7c2eS6auk5lc2ftq4SpkvbCaHB8NQGug== X-Received: by 2002:a05:6000:184c:b0:339:20de:b0f2 with SMTP id c12-20020a056000184c00b0033920deb0f2mr3151716wri.93.1705913522299; Mon, 22 Jan 2024 00:52:02 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a2-20020a5d5702000000b0033928aadde1sm5795169wrv.48.2024.01.22.00.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 00:52:01 -0800 (PST) Message-ID: <1ece724b1ca7f71542bfef42795fce798563ecde.1705913519.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 22 Jan 2024 08:51:59 +0000 Subject: [PATCH 2/2] patch-id: replace `atoi()` with `strtol_i2()` 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: Mohit Marathe , Mohit Marathe From: Mohit Marathe From: Mohit Marathe The change is made to improve the error-handling capabilities during the conversion of string representations to integers. The `strtol_i2(` function offers a more robust mechanism for converting strings to integers by providing enhanced error detection. Unlike `atoi(`, `strtol_i2(` allows the code to differentiate between a valid conversion and an invalid one, offering better resilience against potential issues such as reading hunk header of a corrupted patch. Signed-off-by: Mohit Marathe --- builtin/patch-id.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 3894d2b9706..6bfb263de5e 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -1,3 +1,4 @@ +#include "git-compat-util.h" #include "builtin.h" #include "config.h" #include "diff.h" @@ -29,33 +30,32 @@ static int scan_hunk_header(const char *p, int *p_before, int *p_after) { static const char digits[] = "0123456789"; const char *q, *r; + char *endp; int n; q = p + 4; n = strspn(q, digits); if (q[n] == ',') { q += n + 1; - *p_before = atoi(q); + if (strtol_i2(q, 10, p_before, &endp) != 0) + return 0; n = strspn(q, digits); } else { *p_before = 1; } - if (n == 0 || q[n] != ' ' || q[n+1] != '+') + if (q[n] != ' ' || q[n+1] != '+') return 0; r = q + n + 2; n = strspn(r, digits); if (r[n] == ',') { r += n + 1; - *p_after = atoi(r); - n = strspn(r, digits); + if (strtol_i2(r, 10, p_after, &endp) != 0) + return 0; } else { *p_after = 1; } - if (n == 0) - return 0; - return 1; }