libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clarified handling of NULL name with Xorriso_set_local_charset(). Coverity CID 28719.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-11-09 12:14:52 +00:00
parent d0edba0b9d
commit 06f5016114
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libisoburn/trunk/xorriso/lib_mgt.c
View File

@ -474,14 +474,14 @@ int Xorriso_set_local_charset(struct XorrisO *xorriso, char *name, int flag)
nl_charset= nl_langinfo(CODESET); nl_charset= nl_langinfo(CODESET);
if(name == NULL) if(name == NULL)
name= nl_charset; name= nl_charset;
if(name == NULL)
goto cannot;
if(name != NULL) {
iconv_ret= iconv_open(nl_charset, name); iconv_ret= iconv_open(nl_charset, name);
if(iconv_ret == (iconv_t) -1) if(iconv_ret == (iconv_t) -1)
goto cannot; goto cannot;
else else
iconv_close(iconv_ret); iconv_close(iconv_ret);
}
ret= iso_set_local_charset(name, 0); ret= iso_set_local_charset(name, 0);
if(ret <= 0) { if(ret <= 0) {
cannot:; cannot:;

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.11.09.105122" #define Xorriso_timestamP "2015.11.09.121421"