From: solar <unknown>
Date: Tue, 14 Dec 2010 06:16:35 +0000 (+0000)
Subject: Fixed safeguard calculation in ftell().
X-Git-Tag: v0.5~8
X-Git-Url: https://pd.if.org/git/?p=pdclib;a=commitdiff_plain;h=ef6aa72f40326153ba99e833340ace354799ed95

Fixed safeguard calculation in ftell().
---

diff --git a/functions/stdio/ftell.c b/functions/stdio/ftell.c
index e392a8b..29c360a 100644
--- a/functions/stdio/ftell.c
+++ b/functions/stdio/ftell.c
@@ -28,12 +28,11 @@ long int ftell( struct _PDCLIB_file_t * stream )
            i.e. unprocessed bytes as positive number.
        That is how the somewhat obscure return-value calculation works.
     */
-    /* If offset is too large for return type, report error instead of wrong
-       offset value. Buffers may not be larger than INT_MAX so the casts are
-       safe.
+    /*  If offset is too large for return type, report error instead of wrong
+        offset value.
     */
-    /* FIXME: This calculation *underflows* when offset smaller than pre-read */
-    if ( ( stream->pos.offset - ( (int)stream->bufend + (int)stream->ungetidx ) ) > ( LONG_MAX - stream->bufidx ) )
+    /* TODO: Check what happens when ungetc() is called on a stream at offset 0 */
+    if ( ( stream->pos.offset - stream->bufend ) > ( LONG_MAX - ( stream->bufidx - stream->ungetidx ) ) )
     {
         /* integer overflow */
         _PDCLIB_errno = _PDCLIB_ERANGE;