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); Thu, 04 Mar 2021 19:49:19 +0000 (GMT)
Received: from localhost ([172.29.0.7])
	by sv1.famkaufmann.info with LMTP
	id SGk7J6M5QWBDSwAALHnFKQ
	(envelope-from <mayernico256@gmail.com>)
	for <mlmmj-tyndur-devel>; Thu, 04 Mar 2021 19:48:51 +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 2290b856 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <tyndur-devel@tyndur.org>;
	Thu, 4 Mar 2021 19:48:51 +0000 (UTC)
Received: by mail-ed1-x532.google.com with SMTP id b7so23025571edz.8
        for <tyndur-devel@tyndur.org>; Thu, 04 Mar 2021 11:48:50 -0800 (PST)
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=SPARQLUurTr4+jwZMgdNr4csKWTLlnj+jN8CChdVrKM=;
        b=OIFV6nxmP+Zb0HURqFqnFZTqKgl9cXa7LfaGW7MXMTH5BN+nHCEuCrWPfgLLRR/6Vn
         uZdhcjabV4TZHwAVCCVL4hENdcv5f5c9M+gn7KhALSn6g8Ploxz19O+nUAY3Ziw0F2CK
         wSoJT0E02tq2bHxhHiLh6IsfOe1wLOXNhc5zY1Gm/MZGvkaDu2O2WkQHFV2+fxA/GEk5
         p8rMYPAlPCUNLG9eYnD7DouWsNyCU81jy00xblG9GxW50fzpn4YWfEwC13nhN7/H/kbp
         fcMigBRP4KlI6e3NyTSEt7NCb2Ny0e5bw/n6KyTci/OAtNPSck2qhWpCe7tmpITxtBpc
         LgFQ==
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=SPARQLUurTr4+jwZMgdNr4csKWTLlnj+jN8CChdVrKM=;
        b=KGqWKiTfq7IqKkgKe3foqU0NPMyAf44aE012Q47wd8TEVz9cKSwQOwdLU4OzNZffHb
         HVZhnag6/njdrc14jxoStA27vmc93KQgsBrKl/hTp9V9OxVsznrinXPyUq2iwbWr+MLu
         p5oLdqiK1oKVbKJHOhf8nbRhw1avMdnObnem12WUUC7tc6FprGBBO88ahCs0wqnQr/Hs
         IUW+pXDYxn4yCjZnMyM+n2lMcRnrzsmTggVzHV2cN5dYJA01/FrgwiNFyDwj+Vmky7n7
         ZxmhA4VKtlbzyHqidwA8Bk7E5rBadqK+Qyfk3ln6VmW8Mc11HmdlkdT7szanFY1xy7mX
         yaoQ==
X-Gm-Message-State: AOAM533RK9grYzLCSqj3Z/BdOm4vesWL7tB1gAJS4aGWFrQRAskb5QBq
	rDNbHqDn919bifNWOQ5LZXXisjz6imU=
X-Google-Smtp-Source: ABdhPJxhQssrDPzeZG5u2fu16NvoZTVCI7WR2KXouWpgcaD0Kh40391VO7HfkOlt9vS291Tj54FB8g==
X-Received: by 2002:a50:fe08:: with SMTP id f8mr6217029edt.217.1614887330729;
        Thu, 04 Mar 2021 11:48:50 -0800 (PST)
Received: from localhost.localdomain (p5dec4a7d.dip0.t-ipconnect.de. [93.236.74.125])
        by smtp.gmail.com with ESMTPSA id kj3sm124394ejc.117.2021.03.04.11.48.49
        for <tyndur-devel@tyndur.org>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Thu, 04 Mar 2021 11:48:50 -0800 (PST)
From: Nico Mayer <mayernico256@gmail.com>
X-Google-Original-From: Nico Mayer <mayerNico256@gmail.com>
To: tyndur-devel@tyndur.org
Subject: [PATCH v2 2/2] =?UTF-8?q?libc:=20=C3=9Cberarbeiten=20des=20=C3=9C?= =?UTF-8?q?berlaufverhalten=20von=20scanf?=
Date: Thu,  4 Mar 2021 20:48:39 +0100
Message-Id: <20210304194839.64983-2-mayerNico256@gmail.com>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20210304194839.64983-1-mayerNico256@gmail.com>
References: <20210304194839.64983-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..6d288e36 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(int)) {
+                                value = strtoul(buf, &endptr, base);
+                            } else {
+                                value = strtoull(buf, &endptr, base);
+                            }
+                        } else {
+                            if (size == sizeof(int)) {
+                                value = strtol(buf, &endptr, base);
+                            } else {
+                                value = strtoll(buf, &endptr, base);
+                            }
+                        }
+
                         if ((endptr != buf + len) || (len == 0)) {
                             if ((len == 0) && eof) {
                                 goto input_error;
-- 
2.29.2

