Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by a9b8c5461646 with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Mon, 15 Mar 2021 11:45:38 +0000 (GMT)
Received: from localhost ([172.29.0.7])
	by sv1.famkaufmann.info with LMTP
	id EP6bN61IT2C+CQAALHnFKQ
	(envelope-from <mayernico256@gmail.com>)
	for <mlmmj-tyndur-devel>; Mon, 15 Mar 2021 11:44:45 +0000
Delivered-To: tyndur-devel@tyndur.org
Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [2a00:1450:4864:20::532])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPS id 0ca194fc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <tyndur-devel@tyndur.org>;
	Mon, 15 Mar 2021 11:44:45 +0000 (UTC)
Received: by mail-ed1-x532.google.com with SMTP id h10so16889917edt.13
        for <tyndur-devel@tyndur.org>; Mon, 15 Mar 2021 04:44:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:to:subject:date:message-id:in-reply-to:references:mime-version
         :content-transfer-encoding;
        bh=8P+HfZj3ik1JkvSEzabcY8QgPDk4RKJOWwxfPE1mYuc=;
        b=WVxDgViOeLFha3WoF39gP+KmIX/8qllNOuE7EhXUBl3CnAkOciRAoo3d+sDdsgQhOt
         wjarRTfLhtP+bj/KB2zK8+Yaa7xm+pObhLZbi8siA1czDafHTqlwnSjRlU304VbBx+7Y
         i8qSXI6Nw6FFKxSr6u94MxU0IofWcWiRDFBDA6uAUA1S4/aQ0fB7iRE3U8/tnuv5C+Cc
         yMHlgtwQlpqfLZpr1O/RPHKK2G7JrsDb4pSXvuQ/FrefLlHzoZWGzAfWxn9NfZk8n1HX
         G4Ugfn+RzVRgN35MMuOqMq91wrIh3dQaHmvDWh+S34cpeKkEOr226Ewf7bDjt1hp5yx3
         WxsQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
         :references:mime-version:content-transfer-encoding;
        bh=8P+HfZj3ik1JkvSEzabcY8QgPDk4RKJOWwxfPE1mYuc=;
        b=KhtZ0hGb3uwOrRH50xP6w1lxPQ00rTigAkK56doWVTZNyCzpQuZr/cYG3bwXccI1Rk
         MjXmDeELMEMUdXg9+5/NPPQVBHxi0/iUuIRCT/tUMZGi1fVkmSL5hRelEpVocrvoupsU
         55ob09uvwiKOX5+bckvHgnRKtykrMt8ju+CD2zn+uwIVaWNBrjbcB/PC3L3if9uv8kOP
         PPBXbytKutA2s3n7m/uY4xftFN267PpfrwOayy4ThHa7u7h4GYkeAisO2ds9Tz7hk0YL
         6XJnoNHqtjBov9kAbCUJ9KKiM6Z53N18dec4Lo5kBOHoGPg3E3jdQ+0JYyKniKns8e1G
         K2Yg==
X-Gm-Message-State: AOAM533cjGFju9MqGUp36vSvC1x9UIkfoorr0yApJdXqWwi3MyUEb5cH
	gv/OBjwgjryxhHev+ERVEbhh3aWrR08=
X-Google-Smtp-Source: ABdhPJyPX9yk68B4zVCWW8gPisAgwR9dSVBcpWbuQeiDUqoF1WnlJQ8yN2IfUSscmP2Iu4jrf4LY8w==
X-Received: by 2002:a05:6402:30a2:: with SMTP id df2mr29262065edb.29.1615808685108;
        Mon, 15 Mar 2021 04:44:45 -0700 (PDT)
Received: from localhost.localdomain (p5dec4f40.dip0.t-ipconnect.de. [93.236.79.64])
        by smtp.gmail.com with ESMTPSA id f9sm7932485eds.41.2021.03.15.04.44.44
        for <tyndur-devel@tyndur.org>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 15 Mar 2021 04:44:44 -0700 (PDT)
From: Nico Mayer <mayernico256@gmail.com>
X-Google-Original-From: Nico Mayer <mayerNico256@gmail.com>
To: tyndur-devel@tyndur.org
Subject: [PATCH v3 2/2] =?UTF-8?q?libc:=20=C3=9Cberarbeiten=20des=20=C3=9C?= =?UTF-8?q?berlaufverhalten=20von=20scanf?=
Date: Mon, 15 Mar 2021 12:44:30 +0100
Message-Id: <20210315114430.88114-2-mayerNico256@gmail.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210315114430.88114-1-mayerNico256@gmail.com>
References: <20210315114430.88114-1-mayerNico256@gmail.com>
Errors-To: toni@tyndur.org
Precedence: list
Reply-To: tyndur-Patches <tyndur-devel@tyndur.org>
List-Id: tyndur-Patches <tyndur-devel.tyndur.org>
List-Unsubscribe: <mailto:tyndur-devel+unsubscribe@tyndur.org>
List-Post: <mailto:tyndur-devel@tyndur.org>
List-Help: <mailto:tyndur-devel+help@tyndur.org>
List-Subscribe: <mailto:tyndur-devel+subscribe@tyndur.org>
List-Owner: <mailto:toni@tyndur.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Nico Mayer <mayerNico@outlook.de>

! Die bisherige Implementierung der Scanf-Funktion verwendet für das
  Einlesen der Zahlen ausschließlich die Funktion strtoull. Hierdurch verhält
  sich die Scanf-Funktion bei Überläufen bzw. Unterläufen bei verschiedenen
  Datentypen falsch. Mit diesem Commit wählt jetzt die Scanf-Funktion
  für den jeweiligen Datentyp die passende strtoxxx-Funktion aus.

Signed-off-by: Nico Mayer <mayerNico@outlook.de>
---
 src/modules/lib/stdlibc/scanf.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/modules/lib/stdlibc/scanf.c b/src/modules/lib/stdlibc/scanf.c
index 0f978606..07ca53e6 100644
--- a/src/modules/lib/stdlibc/scanf.c
+++ b/src/modules/lib/stdlibc/scanf.c
@@ -33,6 +33,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <ctype.h>
+#include <stdbool.h>
 
 typedef int (*jscanf_getc)(void* state);
 typedef void (*jscanf_ungetc)(void* state, char c);
@@ -185,6 +186,7 @@ static int jscanf(const char* fmt, va_list ap,
     int c;
     char* endptr;
     uint64_t value;
+    bool is_unsigned = false;
 
     // 64 Bit oktal = 22 Zeichen, führende 0, Vorzeichen und \0
     char buf[25];
@@ -282,22 +284,30 @@ static int jscanf(const char* fmt, va_list ap,
                     // %p - Pointer (strtoul mit Basis 16)
                     case 'i':
                         base = 0;
+                        is_unsigned = false;
                         goto convert_number;
                     case 'o':
                         base = 8;
+                        is_unsigned = true;
                         goto convert_number;
                     case 'x':
                     case 'X':
                         base = 16;
+                        is_unsigned = true;
                         goto convert_number;
                     case 'p':
                         base = 16;
                         size = sizeof(void*);
                         len = 0;
+                        is_unsigned = true;
                         goto convert_number;
                     case 'd':
+                        base = 10;
+                        is_unsigned = false;
+                        goto convert_number;
                     case 'u':
                         base = 10;
+                        is_unsigned = true;
                     convert_number:
                         if (len == 0 || len >= sizeof(buf)) {
                             len = sizeof(buf) - 1;
@@ -305,7 +315,21 @@ static int jscanf(const char* fmt, va_list ap,
                         len = jscanf_read_number(buf, len, jgetc, jungetc,
                             state, base, &eof);
 
-                        value = strtoull(buf, &endptr, base);
+                        // Auswählen der richtigen strtoxxx-Funktion
+                        if (is_unsigned) {
+                            if (size == sizeof(long long)) {
+                                value = strtoull(buf, &endptr, base);
+                            } else {
+                                value = strtoul(buf, &endptr, base);
+                            }
+                        } else {
+                            if (size == sizeof(long long)) {
+                                value = strtoll(buf, &endptr, base);
+                            } else {
+                                value = strtol(buf, &endptr, base);
+                            }
+                        }
+
                         if ((endptr != buf + len) || (len == 0)) {
                             if ((len == 0) && eof) {
                                 goto input_error;
-- 
2.30.2

