diff mbox series

curses ui: add missing iconv_close

Message ID 20190314171804.8471-1-samuel.thibault@ens-lyon.org (mailing list archive)
State New, archived
Headers show
Series curses ui: add missing iconv_close | expand

Commit Message

Samuel Thibault March 14, 2019, 5:18 p.m. UTC
The iconv_t is opened but never closed.

Spotted by Coverity: CID 1399708
Spotted by Coverity: CID 1399709
Spotted by Coverity: CID 1399713

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 ui/curses.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Peter Maydell March 14, 2019, 5:21 p.m. UTC | #1
On Thu, 14 Mar 2019 at 17:20, Samuel Thibault
<samuel.thibault@ens-lyon.org> wrote:
>
> The iconv_t is opened but never closed.
>
> Spotted by Coverity: CID 1399708
> Spotted by Coverity: CID 1399709
> Spotted by Coverity: CID 1399713
>
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> ---
>  ui/curses.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/ui/curses.c b/ui/curses.c
> index 3a7e8649f3..1f83a15a1c 100644
> --- a/ui/curses.c
> +++ b/ui/curses.c
> @@ -646,6 +646,7 @@ static void font_setup(void)
>              }
>          }
>      }
> +    iconv_close(ucs_to_wchar_conv);
>  }

Don't you need to iconv_close() font_conv and
wchar_to_ucs_conv as well ?

thanks
-- PMM
Samuel Thibault March 14, 2019, 5:27 p.m. UTC | #2
Peter Maydell, le jeu. 14 mars 2019 17:21:54 +0000, a ecrit:
> On Thu, 14 Mar 2019 at 17:20, Samuel Thibault
> <samuel.thibault@ens-lyon.org> wrote:
> >
> > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> > ---
> >  ui/curses.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/ui/curses.c b/ui/curses.c
> > index 3a7e8649f3..1f83a15a1c 100644
> > --- a/ui/curses.c
> > +++ b/ui/curses.c
> > @@ -646,6 +646,7 @@ static void font_setup(void)
> >              }
> >          }
> >      }
> > +    iconv_close(ucs_to_wchar_conv);
> >  }
> 
> Don't you need to iconv_close() font_conv and
> wchar_to_ucs_conv as well ?

Right, sorry, since I didn't have coverity access I didn't realize there
were three leaks.

Samuel
Peter Maydell March 14, 2019, 5:35 p.m. UTC | #3
On Thu, 14 Mar 2019 at 17:27, Samuel Thibault <samuel.thibault@gnu.org> wrote:
>
> Peter Maydell, le jeu. 14 mars 2019 17:21:54 +0000, a ecrit:
> > On Thu, 14 Mar 2019 at 17:20, Samuel Thibault
> > <samuel.thibault@ens-lyon.org> wrote:
> > >
> > > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> > > ---
> > >  ui/curses.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/ui/curses.c b/ui/curses.c
> > > index 3a7e8649f3..1f83a15a1c 100644
> > > --- a/ui/curses.c
> > > +++ b/ui/curses.c
> > > @@ -646,6 +646,7 @@ static void font_setup(void)
> > >              }
> > >          }
> > >      }
> > > +    iconv_close(ucs_to_wchar_conv);
> > >  }
> >
> > Don't you need to iconv_close() font_conv and
> > wchar_to_ucs_conv as well ?
>
> Right, sorry, since I didn't have coverity access I didn't realize there
> were three leaks.

I did mention all 3 variables in my email about the issue :-)

thanks
-- PMM
diff mbox series

Patch

diff --git a/ui/curses.c b/ui/curses.c
index 3a7e8649f3..1f83a15a1c 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -646,6 +646,7 @@  static void font_setup(void)
             }
         }
     }
+    iconv_close(ucs_to_wchar_conv);
 }
 
 static void curses_setup(void)