Check for EOF in ASCII conversions.

The C standard defines EOF as:

    ... an integer constant expression, with type int and a negative value...

This means a conforming implemenetation could define this as a one of the
printable characters.  This won't be a problem for ASCII.

A specific test case has been added for EOF.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4240)

diff --git a/crypto/ctype.c b/crypto/ctype.c
index 588c6dac3cc2c4ac390db55864b00607ba8eecf7..813be25a074121df57e357d44d2c48719a02504d 100644 (file)
--- a/crypto/ctype.c
+++ b/crypto/ctype.c
@@ -8,6 +8,7 @@
  */
 
 #include <string.h>
+#include <stdio.h>
 #include "internal/ctype.h"
 #include "openssl/ebcdic.h"
 
@@ -225,7 +226,7 @@ static const unsigned short ctype_char_map[128] = {
 #ifdef CHARSET_EBCDIC
 int ossl_toascii(int c)
 {
-    if (c < -128 || c > 256)
+    if (c < -128 || c > 256 || c == EOF)
         return c;
     /*
      * Adjust negatively signed characters.
@@ -240,7 +241,7 @@ int ossl_toascii(int c)
 
 int ossl_fromascii(int c)
 {
-    if (c < -128 || c > 256)
+    if (c < -128 || c > 256 || c == EOF)
         return c;
     if (c < 0)
         c += 256;

diff --git a/test/ctype_internal_test.c b/test/ctype_internal_test.c
index 6b66cfbaa0a0e4d25324c002cb4ae164a696ce43..04ab14d73f219c6ff4f2b3538b82d11ad53fcad8 100644 (file)
--- a/test/ctype_internal_test.c
+++ b/test/ctype_internal_test.c
@@ -68,10 +68,16 @@ static int test_ctype_tolower(int n)
            && TEST_int_eq(ossl_tolower(case_change[n].l), case_change[n].l);
 }
 
+static int test_ctype_eof(void)
+{
+    return test_ctype_chars(EOF);
+}
+
 int setup_tests(void)
 {
     ADD_ALL_TESTS(test_ctype_chars, 128);
     ADD_ALL_TESTS(test_ctype_toupper, OSSL_NELEM(case_change));
     ADD_ALL_TESTS(test_ctype_tolower, OSSL_NELEM(case_change));
+    ADD_TEST(test_ctype_eof);
     return 1;
 }