aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-07-04 23:41:43 (GMT)
committersimonb <simonb>2006-07-04 23:41:43 (GMT)
commitb407e121badd48b0fd3fdfe2e47a5ac3bfa7f047 (patch)
tree7bffc70871930f6ddeef70b46f79b95ee79f5ce0
parentc3846743fba060716b9090d3684fb273464ab2ae (diff)
downloadfluxbox_pavel-b407e121badd48b0fd3fdfe2e47a5ac3bfa7f047.zip
fluxbox_pavel-b407e121badd48b0fd3fdfe2e47a5ac3bfa7f047.tar.bz2
fix crash on startup from iconv_close of an invalid descriptor
-rw-r--r--ChangeLog3
-rw-r--r--src/FbTk/FbString.cc3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f79d0ae..e5f91c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/07/05:
4 * Fix crash on startup on some platforms (Simon)
5 FbTk/FbString.cc
3*06/07/04: 6*06/07/04:
4 * Fix some sizing issues from gravity change patch (Simon) 7 * Fix some sizing issues from gravity change patch (Simon)
5 FbWinFrame.hh/cc Window.cc 8 FbWinFrame.hh/cc Window.cc
diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
index d3f6b81..ff4d27a 100644
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@@ -261,7 +261,8 @@ bool StringConvertor::setSource(const std::string &encoding) {
261 if (newiconv == ((iconv_t)(-1))) 261 if (newiconv == ((iconv_t)(-1)))
262 return false; 262 return false;
263 else { 263 else {
264 iconv_close(m_iconv); 264 if (m_iconv != ((iconv_t)-1))
265 iconv_close(m_iconv);
265 m_iconv = newiconv; 266 m_iconv = newiconv;
266 return true; 267 return true;
267 } 268 }