const i18n_uchar *uchar_result = (i18n_uchar *)result.getTerminatedBuffer();
- retv_if(uchar_result == NULL, I18N_ERROR_INVALID_PARAMETER);
+ if(uchar_result == NULL) {
+ ERR("result.getTerminatedBuffer() == NULL");
+ free(measure_array);
+ return I18N_ERROR_INVALID_PARAMETER;
+ }
+
*output_length = i18n_ustring_get_length(uchar_result);
- retv_if(append_to_size < *output_length, I18N_ERROR_BUFFER_OVERFLOW);
+ if(append_to_size < *output_length) {
+ ERR("append_to_size < *output_length");
+ free(measure_array);
+ return I18N_ERROR_BUFFER_OVERFLOW;
+ }
if (*output_length > 0)
i18n_ustring_copy_n(append_to, uchar_result, append_to_size);