all repos — fluxbox @ b407e121badd48b0fd3fdfe2e47a5ac3bfa7f047

custom fork of the fluxbox windowmanager 

fix crash on startup from iconv_close of an invalid descriptor
simonb simonb
commit

b407e121badd48b0fd3fdfe2e47a5ac3bfa7f047

parent

c3846743fba060716b9090d3684fb273464ab2ae

2 files changed, 5 insertions(+), 1 deletions(-)

jump to
M ChangeLog → ChangeLog 
@@ -1,5 +1,8 @@ 
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
+*06/07/05:
+   * Fix crash on startup on some platforms (Simon)
+     FbTk/FbString.cc
 *06/07/04:
    * Fix some sizing issues from gravity change patch (Simon)
      FbWinFrame.hh/cc Window.cc
M src/FbTk/FbString.cc → src/FbTk/FbString.cc 
@@ -261,7 +261,8 @@ iconv_t newiconv = iconv_open(m_destencoding.c_str(), tempenc.c_str());
     if (newiconv == ((iconv_t)(-1)))
         return false;
     else {
-        iconv_close(m_iconv);
+        if (m_iconv != ((iconv_t)-1))
+            iconv_close(m_iconv);
         m_iconv = newiconv;
         return true;
     }