Merge branch 'wt/strict-input' into api-hardening

# Conflicts:
#	src/screen.c

1 files changed, 9 insertions, 5 deletions

diff --git a/src/text.c b/src/text.c
index 43c3ef5..a646195 100644
--- a/src/text.c
+++ b/src/text.c
@@ -190,10 +190,11 @@ static inline bool try_text_run(struct term *t, const char *buf, size_t len,
     return wrote;
 }
 
+/* The feed flags this build knows. term_feed() rejects any other bit. */
+#define TERM_FEED_KNOWN TERM_FEED_ONLCR
+
 static void term_feed_inner(struct term *t, const char *buf, size_t len, unsigned flags)
 {
-    if (!t || !buf || len == 0)
-        return;
     t->transport_newline = (flags & TERM_FEED_ONLCR) != 0;
     uint16_t cur_flags = term_current_flags(t);
 
@@ -366,13 +367,16 @@ static void term_feed_inner(struct term *t, const char *buf, size_t len, unsigne
     }
 }
 
-void term_feed(struct term *t, const char *buf, size_t len, unsigned flags)
+bool term_feed(struct term *t, const char *buf, size_t len, unsigned flags)
 {
-    if (!t || !buf || len == 0)
-        return;
+    if (!t || (!buf && len > 0) || (flags & ~TERM_FEED_KNOWN))
+        return false;
+    if (len == 0)
+        return true;
     term_write_begin(t);
     term_feed_inner(t, buf, len, flags);
     term_write_end(t);
+    return true;
 }
 
 void term_text_repeat(struct term *t, int count)