summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/util/charset/convert_string.c1
-rw-r--r--lib/util/charset/util_str.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/util/charset/convert_string.c b/lib/util/charset/convert_string.c
index 50065f8e076..196302aacfd 100644
--- a/lib/util/charset/convert_string.c
+++ b/lib/util/charset/convert_string.c
@@ -375,6 +375,7 @@ bool convert_string_talloc_handle(TALLOC_CTX *ctx, struct smb_iconv_handle *ic,
}
ob = talloc_zero_array(ctx, char, destlen);
if (ob == NULL) {
+ DBG_ERR("Could not talloc destination buffer.\n");
errno = ENOMEM;
return false;
}
diff --git a/lib/util/charset/util_str.c b/lib/util/charset/util_str.c
index 6feed1742ac..3f5b247bd92 100644
--- a/lib/util/charset/util_str.c
+++ b/lib/util/charset/util_str.c
@@ -570,13 +570,11 @@ char *strstr_m(const char *src, const char *findstr)
frame = talloc_stackframe();
if (!push_ucs2_talloc(frame, &src_w, src, &converted_size)) {
- DBG_WARNING("src malloc fail\n");
TALLOC_FREE(frame);
return NULL;
}
if (!push_ucs2_talloc(frame, &find_w, findstr, &converted_size)) {
- DBG_WARNING("find malloc fail\n");
TALLOC_FREE(frame);
return NULL;
}
@@ -591,7 +589,6 @@ char *strstr_m(const char *src, const char *findstr)
*p = 0;
if (!pull_ucs2_talloc(frame, &s2, src_w, &converted_size)) {
TALLOC_FREE(frame);
- DEBUG(0,("strstr_m: dest malloc fail\n"));
return NULL;
}
retp = discard_const_p(char, (s+strlen(s2)));