[prev in list] [next in list] [prev in thread] [next in thread] 

List:       musl
Subject:    =?gb2312?B?tPC4tDogW211c2xdIFtQQVRDSCAxLzFdIHVuZ2V0YzogQ2FzdCB0byB1bnNp?= =?gb2312?Q?gned_char_befor
From:       "wangjianjian (C)" <wangjianjian3 () huawei ! com>
Date:       2019-10-20 4:29:54
Message-ID: 5707781e134941d6b6d470054209d72f () huawei ! com
[Download RAW message or body]

Thanks for review. I will send a v2.

-----ÓʼþÔ­¼þ-----
·¢¼þÈË: Szabolcs Nagy [mailto:nsz@port70.net] 
·¢ËÍʱ¼ä: 2019Äê10Ô 18ÈÕ 21:15
ÊÕ¼þÈË: musl@lists.openwall.com
³­ËÍ: wangjianjian (C) <wangjianjian3@huawei.com>
Ö÷Ìâ: Re: [musl] [PATCH 1/1] ungetc: Cast to unsigned char before push back to stream

* wangjianjian (C) <wangjianjian3@huawei.com> [2019-10-18 12:35:45 +0000]:
> >From 4d24e6fee85ed878dc632dd29aabeb7c7454952e Mon Sep 17 00:00:00 
> >2001
> From: Wang Jianjian <wangjianjian3@huawei.com>
> Date: Fri, 18 Oct 2019 20:28:29 +0800
> Subject: [PATCH 1/1] ungetc: Cast to unsigned char before push back to 
> stream
> 
> Per Posix standard, casting to unsigned char is need before returning 
> C and pushing C back to stream.
> 
> Signed-off-by: Wang Jianjian <wangjianjian3@huawei.com>
> ---
>  src/stdio/ungetc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/stdio/ungetc.c b/src/stdio/ungetc.c index 
> 180673a4..9733091a 100644
> --- a/src/stdio/ungetc.c
> +++ b/src/stdio/ungetc.c
> @@ -12,9 +12,9 @@ int ungetc(int c, FILE *f)
>                 return EOF;
>         }
> 
> -       *--f->rpos = c;
> +       *--f->rpos = (unsigned char)c;

this is a noop since assignment will do the conversion.

>         f->flags &= ~F_EOF;
> 
>         FUNLOCK(f);
> -       return c;
> +       return (unsigned char)c;

i think this fixes a real bug.

>  }
> --
> 2.17.1
> 
> BR,
> Wang Jianjian

[prev in list] [next in list] [prev in thread] [next in thread]