The branch, v3-2-test has been updated
via 3797ddb3acc713cc200114e9e27dfb3901e5cdf1 (commit)
from b3e838884350e4da19660f0c1078aabd8e55536b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 3797ddb3acc713cc200114e9e27dfb3901e5cdf1
Author: Jeremy Allison <[email protected]>
Date: Tue Mar 31 18:29:30 2009 -0700
Tidy up some convert_string_internal error cases, found by Andrew Bartlett.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/lib/charcnv.c | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index e51c33d..a4f3276 100644
--- a/source/lib/charcnv.c
+++ b/source/lib/charcnv.c
@@ -242,7 +242,7 @@ static size_t convert_string_internal(charset_t from,
charset_t to,
DEBUG(3,("convert_string_internal:
Conversion error: %s(%s)\n",reason,inbuf));
if (allow_bad_conv)
goto use_as_is;
- break;
+ return (size_t)-1;
case E2BIG:
reason="No more room";
if (!conv_silent) {
@@ -263,11 +263,12 @@ static size_t convert_string_internal(charset_t from,
charset_t to,
DEBUG(3,("convert_string_internal:
Conversion error: %s(%s)\n",reason,inbuf));
if (allow_bad_conv)
goto use_as_is;
- break;
+
+ return (size_t)-1;
default:
if (!conv_silent)
DEBUG(0,("convert_string_internal:
Conversion error: %s(%s)\n",reason,inbuf));
- break;
+ return (size_t)-1;
}
/* smb_panic(reason); */
}
@@ -412,7 +413,11 @@ size_t convert_string(charset_t from, charset_t to,
#ifdef BROKEN_UNICODE_COMPOSE_CHARACTERS
goto general_case;
#else
- return retval + convert_string_internal(from,
to, p, slen, q, dlen, allow_bad_conv);
+ size_t ret = convert_string_internal(from, to,
p, slen, q, dlen, allow_bad_conv);
+ if (ret == (size_t)-1) {
+ return ret;
+ }
+ return retval + ret;
#endif
}
}
@@ -448,7 +453,11 @@ size_t convert_string(charset_t from, charset_t to,
#ifdef BROKEN_UNICODE_COMPOSE_CHARACTERS
goto general_case;
#else
- return retval + convert_string_internal(from,
to, p, slen, q, dlen, allow_bad_conv);
+ size_t ret = convert_string_internal(from, to,
p, slen, q, dlen, allow_bad_conv);
+ if (ret == (size_t)-1) {
+ return ret;
+ }
+ return retval + ret;
#endif
}
}
@@ -484,7 +493,11 @@ size_t convert_string(charset_t from, charset_t to,
#ifdef BROKEN_UNICODE_COMPOSE_CHARACTERS
goto general_case;
#else
- return retval + convert_string_internal(from,
to, p, slen, q, dlen, allow_bad_conv);
+ size_t ret = convert_string_internal(from, to,
p, slen, q, dlen, allow_bad_conv);
+ if (ret == (size_t)-1) {
+ return ret;
+ }
+ return retval + ret;
#endif
}
}
--
Samba Shared Repository
