diff mbox series

[FFmpeg-devel] avformat/utils: fix logic error in ff_mkdir_p

Message ID 0312e78bbd8d4140ef658f6d1b653dea76cfcafa.1643095757.git.pross@xvid.org
State New
Headers show
Series [FFmpeg-devel] avformat/utils: fix logic error in ff_mkdir_p | expand

Checks

Context Check Description
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Peter Ross Jan. 25, 2022, 7:30 a.m. UTC 
Fix ticket# 9605

Signed-off-by: Peter Ross <pross@xvid.org>
---
 libavformat/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Ross Feb. 13, 2022, 12:28 a.m. UTC | #1 
On Tue, Jan 25, 2022 at 06:30:03PM +1100, Peter Ross wrote:
> Fix ticket# 9605
> 
> Signed-off-by: Peter Ross <pross@xvid.org>
> ---
>  libavformat/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/utils.c b/libavformat/utils.c
> index e643821fc9..1164cebe68 100644
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -1135,7 +1135,7 @@ int ff_mkdir_p(const char *path)
>          }
>      }
>  
> -    if ((*(pos - 1) != '/') || (*(pos - 1) != '\\')) {
> +    if ((*(pos - 1) != '/') && (*(pos - 1) != '\\')) {
>          ret = mkdir(temp, 0755);
>      }
>  
> -- 
> 2.34.1
> 
> -- Peter
> (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

i will apply in a couple of days if no one objects.
this closes ticket# 9605 (-Wlogical-op)

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
diff mbox series

Patch

diff --git a/libavformat/utils.c b/libavformat/utils.c
index e643821fc9..1164cebe68 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1135,7 +1135,7 @@  int ff_mkdir_p(const char *path)
         }
     }
 
-    if ((*(pos - 1) != '/') || (*(pos - 1) != '\\')) {
+    if ((*(pos - 1) != '/') && (*(pos - 1) != '\\')) {
         ret = mkdir(temp, 0755);
     }