lib: improve sanity checks in stream_set_endp()
* lib/stream.c: (stream_set_endp) Add checks to make sure that the
supplied 'endp' is within the 'size' of the stream, and that the
current read pointer 'getp' is not beyond the specified 'endp'.
diff --git a/lib/stream.c b/lib/stream.c
index b226a25..ee2920e 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -219,13 +219,23 @@
{
STREAM_VERIFY_SANE(s);
- if (!GETP_VALID (s, pos))
+ if (!ENDP_VALID(s, pos))
{
STREAM_BOUND_WARN (s, "set endp");
- pos = s->endp;
+ return;
+ }
+
+ /*
+ * Make sure the current read pointer is not beyond the new endp.
+ */
+ if (s->getp > pos)
+ {
+ STREAM_BOUND_WARN(s, "set endp");
+ return;
}
s->endp = pos;
+ STREAM_VERIFY_SANE(s);
}
/* Forward pointer. */