Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by 57269a166aaa with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Sun, 26 Jan 2020 23:20:52 +0000 (GMT)
Received: from 4e0d9c617c68 ([172.29.0.2])
	by sv1.famkaufmann.info (Dovecot) with LMTP id YbnYKqkeLl4ebgAAM0Xwgw
	for <mlmmj-tyndur-devel>; Sun, 26 Jan 2020 23:20:09 +0000
Delivered-To: tyndur-devel@tyndur.org
Received: from faunus.fritz.box (p200300F3F7228500AFEE4A56EAA43362.dip0.t-ipconnect.de [IPv6:2003:f3:f722:8500:afee:4a56:eaa4:3362])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPSA id 307954ba
	TLS version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO
	for <tyndur-devel@tyndur.org>;
	Sun, 26 Jan 2020 23:20:09 +0000 (UTC)
From: Kevin Wolf <kevin@tyndur.org>
To: tyndur-devel@tyndur.org
Subject: [PATCH] libc: fopen()-Modus korrekter parsen
Date: Mon, 27 Jan 2020 00:20:05 +0100
Message-Id: <20200126232005.15399-1-kevin@tyndur.org>
X-Mailer: git-send-email 2.16.4
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

! libc: Bisher musste im fopen()-Modus das "+" direkt nach "r"/"w"/"a"
  kommen, damit es eine Wirkung hatte. Das ist falsch, denn dazwischen
  darf auch noch ein "b" kommen.

  Dieser Patch fixt den Parser, so dass er alle vorgesehenen Varianten
  akzeptiert, und die meisten nicht vorgesehenen mit EINVAL ablehnt.
  ("rb+b" usw. ist noch möglich, aber das sollte harmlos sein.)

Signed-off-by: Kevin Wolf <kevin@tyndur.org>
---
 src/modules/lib/stdlibc/file.c | 62 +++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/modules/lib/stdlibc/file.c b/src/modules/lib/stdlibc/file.c
index b3dc653d8..101bdc5f9 100644
--- a/src/modules/lib/stdlibc/file.c
+++ b/src/modules/lib/stdlibc/file.c
@@ -95,41 +95,47 @@ FILE* __create_file_from_lio_stream(lio_stream_t s)
 FILE* fopen (const char* filename, const char* mode)
 {
     uint8_t attr;
+    int i;
 
     //Attribute aus dem mode-String parsen
     attr = 0;
-    int i;
-    for (i = 0; i < strlen(mode); i++) {
-        switch (mode[i]) {
-            case 'r':
-                attr |= IO_OPEN_MODE_READ;
-                if (mode[i + 1] == '+') {
-                    attr |= IO_OPEN_MODE_WRITE;
-                }
-                break;
+    i = 0;
 
-            case 'w':
-                attr |= IO_OPEN_MODE_WRITE | IO_OPEN_MODE_CREATE |
-                    IO_OPEN_MODE_TRUNC;
+    switch (mode[i++]) {
+        case 'r':
+            attr |= IO_OPEN_MODE_READ;
+            goto parse_plus;
 
-                // Bei w+ muss Lesen auch aktiviert werden.
-                if (mode[i + 1] == '+') {
-                    attr |= IO_OPEN_MODE_READ;
-                }
-                break;
+        case 'w':
+            attr |= IO_OPEN_MODE_WRITE | IO_OPEN_MODE_CREATE |
+                IO_OPEN_MODE_TRUNC;
+            goto parse_plus;
 
-            case 'a':
-                attr |= IO_OPEN_MODE_WRITE | IO_OPEN_MODE_CREATE
-                    | IO_OPEN_MODE_APPEND;
-                if (mode[i + 1] == '+') {
-                    attr |= IO_OPEN_MODE_READ;
-                }
-                break;
+        case 'a':
+            attr |= IO_OPEN_MODE_WRITE | IO_OPEN_MODE_CREATE
+                | IO_OPEN_MODE_APPEND;
+            goto parse_plus;
 
-            case 'd':
-                attr |= IO_OPEN_MODE_DIRECTORY;
-                break;
-        }
+        case 'd':
+            attr |= IO_OPEN_MODE_DIRECTORY;
+            break;
+
+        parse_plus:
+            if (mode[i] == 'b') {
+                i++;
+            }
+            if (mode[i] == '+') {
+                attr |= IO_OPEN_MODE_READ | IO_OPEN_MODE_WRITE;
+                i++;
+            }
+            if (mode[i] == 'b') {
+                i++;
+            }
+            break;
+    }
+    if (mode[i] != '\0') {
+        errno = EINVAL;
+        return NULL;
     }
 
     // Datei oeffnen
-- 
2.16.4

