1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

dtcm: Coverity 88741, 88121 and 88692

This commit is contained in:
Peter Howkins 2018-07-04 22:27:43 +01:00
parent 4d15194de0
commit d8fb638dde

View file

@ -514,6 +514,9 @@ CvtStr( char *charSet, void *from, unsigned long from_len,
&InterChCodeSet ); &InterChCodeSet );
} else { } else {
/* Convert charSet to StdInterChangeCodeSet */ /* Convert charSet to StdInterChangeCodeSet */
free(ret_locale);
free(ret_lang);
free(ret_codeset);
ret_locale = ret_lang = ret_codeset = NULL; ret_locale = ret_lang = ret_codeset = NULL;
DtXlateOpToStdLocale( DtLCX_OPER_MIME, DtXlateOpToStdLocale( DtLCX_OPER_MIME,
charSet, charSet,
@ -551,6 +554,9 @@ CvtStr( char *charSet, void *from, unsigned long from_len,
#endif /* _AIX */ #endif /* _AIX */
{ {
/* Convert InterChCodeSet to StdCodeSet */ /* Convert InterChCodeSet to StdCodeSet */
free(ret_locale);
free(ret_lang);
free(ret_codeset);
ret_locale = ret_lang = ret_codeset = NULL; ret_locale = ret_lang = ret_codeset = NULL;
DtXlateOpToStdLocale( DtLCX_OPER_INTERCHANGE_CODESET, DtXlateOpToStdLocale( DtLCX_OPER_INTERCHANGE_CODESET,
InterChCodeSet, InterChCodeSet,
@ -579,6 +585,9 @@ CvtStr( char *charSet, void *from, unsigned long from_len,
&from_codeset ); &from_codeset );
} else { } else {
/* Convert charSet to StdInterChangeCodeSet */ /* Convert charSet to StdInterChangeCodeSet */
free(ret_locale);
free(ret_lang);
free(ret_codeset);
ret_locale = ret_lang = ret_codeset = NULL; ret_locale = ret_lang = ret_codeset = NULL;
DtXlateOpToStdLocale( DtLCX_OPER_MIME, DtXlateOpToStdLocale( DtLCX_OPER_MIME,
charSet, charSet,
@ -606,6 +615,9 @@ CvtStr( char *charSet, void *from, unsigned long from_len,
&InterChCodeSet ); &InterChCodeSet );
} else { } else {
/* Convert charSet to StdInterChangeCodeSet */ /* Convert charSet to StdInterChangeCodeSet */
free(ret_locale);
free(ret_lang);
free(ret_codeset);
ret_locale = ret_lang = ret_codeset = NULL; ret_locale = ret_lang = ret_codeset = NULL;
DtXlateOpToStdLocale( DtLCX_OPER_MIME, DtXlateOpToStdLocale( DtLCX_OPER_MIME,
charSet, charSet,
@ -623,6 +635,10 @@ CvtStr( char *charSet, void *from, unsigned long from_len,
&to_codeset ); &to_codeset );
} }
free(ret_locale);
free(ret_lang);
free(ret_codeset);
*to = NULL; *to = NULL;
*to_len = 0; *to_len = 0;