The branch, master has been updated
via c109a70 Fix convert_string() to take a *converted_size arg. and
return a bool.
from 9ede19f s3-build: make it a little easier to build smbtorture4.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c109a70531de72eef30a695248b91704bd0c7c24
Author: Jeremy Allison <j...@samba.org>
Date: Wed Mar 30 13:08:31 2011 -0700
Fix convert_string() to take a *converted_size arg. and return a bool.
Makes these interfaces much harder to misuse and easier to ensure error
checking.
Autobuild-User: Jeremy Allison <j...@samba.org>
Autobuild-Date: Wed Mar 30 23:59:37 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/tdr/tdr.c | 11 +++---
lib/util/charset/charcnv.c | 6 ++--
lib/util/charset/charset.h | 5 ++-
lib/util/charset/util_unistr.c | 68 +++++++++++++++++++++---------------
librpc/ndr/ndr_string.c | 12 +++---
source3/include/proto.h | 9 +++--
source3/lib/charcnv.c | 74 +++++++++++++++++++++------------------
source3/lib/dprintf.c | 5 ++-
source3/lib/fstring.c | 7 ++--
source3/lib/smbldap.c | 3 +-
source3/smbd/mangle_hash2.c | 11 ++++--
source3/torture/utable.c | 19 +++++++---
source3/web/cgi.c | 13 +++++--
source4/torture/basic/utable.c | 18 ++++++---
14 files changed, 153 insertions(+), 108 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdr/tdr.c b/lib/tdr/tdr.c
index 8ce238b..616cc98 100644
--- a/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -174,7 +174,8 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX
*ctx, const char **v,
NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t
length, uint32_t el_size, charset_t chset)
{
- size_t ret, required;
+ size_t required, size = 0;
+ bool ret;
if (length == -1) {
length = strlen(*v) + 1; /* Extra element for null character */
@@ -183,14 +184,14 @@ NTSTATUS tdr_push_charset(struct tdr_push *tdr, const
char **v, uint32_t length,
required = el_size * length;
TDR_PUSH_NEED_BYTES(tdr, required);
- ret = convert_string(CH_UNIX, chset, *v, strlen(*v),
tdr->data.data+tdr->data.length, required);
- if (ret == -1) {
+ ret = convert_string(CH_UNIX, chset, *v, strlen(*v),
tdr->data.data+tdr->data.length, required, &size);
+ if (ret == false) {
return NT_STATUS_INVALID_PARAMETER;
}
/* Make sure the remaining part of the string is filled with zeroes */
- if (ret < required) {
- memset(tdr->data.data+tdr->data.length+ret, 0, required-ret);
+ if (size < required) {
+ memset(tdr->data.data+tdr->data.length+size, 0, required-size);
}
tdr->data.length += required;
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 3b7dbb3..cefc788 100644
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -184,12 +184,12 @@ _PUBLIC_ bool convert_string_handle(struct
smb_iconv_handle *ic,
case E2BIG:
reason="No more room";
if (from == CH_UNIX) {
- DEBUG(0,("E2BIG: convert_string(%s,%s):
srclen=%d destlen=%d - '%s'\n",
+ DEBUG(0,("E2BIG: convert_string_handle(%s,%s):
srclen=%d destlen=%d - '%s'\n",
charset_name(ic, from),
charset_name(ic, to),
(int)srclen, (int)destlen,
(const char *)src));
} else {
- DEBUG(0,("E2BIG: convert_string(%s,%s):
srclen=%d destlen=%d\n",
+ DEBUG(0,("E2BIG: convert_string_handle(%s,%s):
srclen=%d destlen=%d\n",
charset_name(ic, from),
charset_name(ic, to),
(int)srclen, (int)destlen));
}
@@ -233,7 +233,7 @@ _PUBLIC_ bool convert_string_talloc_handle(TALLOC_CTX *ctx,
if (descriptor == (smb_iconv_t)-1 || descriptor == (smb_iconv_t)0) {
/* conversion not supported, return -1*/
- DEBUG(3, ("convert_string_talloc: conversion from %s to %s not
supported!\n",
+ DEBUG(3, ("convert_string_talloc_handle: conversion from %s to
%s not supported!\n",
charset_name(ic, from),
charset_name(ic, to)));
return false;
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index b17ceab..7374d6e 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -150,9 +150,10 @@ bool convert_string_talloc(TALLOC_CTX *ctx,
void const *src, size_t srclen,
void *dest, size_t *converted_size);
-size_t convert_string(charset_t from, charset_t to,
+bool convert_string(charset_t from, charset_t to,
void const *src, size_t srclen,
- void *dest, size_t destlen);
+ void *dest, size_t destlen,
+ size_t *converted_size);
ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
smb_iconv_t cd,
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index f761613..284863a 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -339,7 +339,8 @@ _PUBLIC_ size_t count_chars_m(const char *s, char c)
/**
* Copy a string from a char* unix src to a dos codepage string destination.
*
- * @return the number of bytes occupied by the string in the destination.
+ * @converted_size the number of bytes occupied by the string in the
destination.
+ * @return bool true if success.
*
* @param flags can include
* <dl>
@@ -350,17 +351,17 @@ _PUBLIC_ size_t count_chars_m(const char *s, char c)
* @param dest_len the maximum length in bytes allowed in the
* destination. If @p dest_len is -1 then no maximum is used.
**/
-static ssize_t push_ascii(void *dest, const char *src, size_t dest_len, int
flags)
+static bool push_ascii(void *dest, const char *src, size_t dest_len, int
flags, size_t *converted_size)
{
size_t src_len;
- ssize_t ret;
+ bool ret;
if (flags & STR_UPPER) {
char *tmpbuf = strupper_talloc(NULL, src);
if (tmpbuf == NULL) {
- return -1;
+ return false;
}
- ret = push_ascii(dest, tmpbuf, dest_len, flags & ~STR_UPPER);
+ ret = push_ascii(dest, tmpbuf, dest_len, flags & ~STR_UPPER,
converted_size);
talloc_free(tmpbuf);
return ret;
}
@@ -370,7 +371,7 @@ static ssize_t push_ascii(void *dest, const char *src,
size_t dest_len, int flag
if (flags & (STR_TERMINATE | STR_TERMINATE_ASCII))
src_len++;
- return convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len);
+ return convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len,
converted_size);
}
/**
@@ -407,7 +408,7 @@ _PUBLIC_ bool push_ascii_talloc(TALLOC_CTX *ctx, char
**dest, const char *src, s
**/
static ssize_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t
src_len, int flags)
{
- size_t ret;
+ size_t size = 0;
if (flags & (STR_TERMINATE | STR_TERMINATE_ASCII)) {
if (src_len == (size_t)-1) {
@@ -420,10 +421,11 @@ static ssize_t pull_ascii(char *dest, const void *src,
size_t dest_len, size_t s
}
}
- ret = convert_string(CH_DOS, CH_UNIX, src, src_len, dest, dest_len);
+ /* We're ignoring the return here.. */
+ (void)convert_string(CH_DOS, CH_UNIX, src, src_len, dest, dest_len,
&size);
if (dest_len)
- dest[MIN(ret, dest_len-1)] = 0;
+ dest[MIN(size, dest_len-1)] = 0;
return src_len;
}
@@ -448,16 +450,18 @@ static ssize_t push_ucs2(void *dest, const char *src,
size_t dest_len, int flags
{
size_t len=0;
size_t src_len = strlen(src);
- size_t ret;
+ size_t size = 0;
+ bool ret;
if (flags & STR_UPPER) {
char *tmpbuf = strupper_talloc(NULL, src);
+ ssize_t retval;
if (tmpbuf == NULL) {
return -1;
}
- ret = push_ucs2(dest, tmpbuf, dest_len, flags & ~STR_UPPER);
+ retval = push_ucs2(dest, tmpbuf, dest_len, flags & ~STR_UPPER);
talloc_free(tmpbuf);
- return ret;
+ return retval;
}
if (flags & STR_TERMINATE)
@@ -473,14 +477,14 @@ static ssize_t push_ucs2(void *dest, const char *src,
size_t dest_len, int flags
/* ucs2 is always a multiple of 2 bytes */
dest_len &= ~1;
- ret = convert_string(CH_UNIX, CH_UTF16, src, src_len, dest, dest_len);
- if (ret == (size_t)-1) {
+ ret = convert_string(CH_UNIX, CH_UTF16, src, src_len, dest, dest_len,
&size);
+ if (ret == false) {
return 0;
}
- len += ret;
+ len += size;
- return len;
+ return (ssize_t)len;
}
@@ -529,7 +533,7 @@ _PUBLIC_ bool push_utf8_talloc(TALLOC_CTX *ctx, char
**dest, const char *src, si
static size_t pull_ucs2(char *dest, const void *src, size_t dest_len, size_t
src_len, int flags)
{
- size_t ret;
+ size_t size = 0;
if (ucs2_align(NULL, src, flags)) {
src = (const void *)((const char *)src + 1);
@@ -548,10 +552,11 @@ static size_t pull_ucs2(char *dest, const void *src,
size_t dest_len, size_t src
/* ucs2 is always a multiple of 2 bytes */
if (src_len != (size_t)-1)
src_len &= ~1;
-
- ret = convert_string(CH_UTF16, CH_UNIX, src, src_len, dest, dest_len);
+
+ /* We're ignoring the return here.. */
+ (void)convert_string(CH_UTF16, CH_UNIX, src, src_len, dest, dest_len,
&size);
if (dest_len)
- dest[MIN(ret, dest_len-1)] = 0;
+ dest[MIN(size, dest_len-1)] = 0;
return src_len;
}
@@ -618,7 +623,12 @@ _PUBLIC_ bool pull_utf8_talloc(TALLOC_CTX *ctx, char
**dest, const char *src, si
_PUBLIC_ ssize_t push_string(void *dest, const char *src, size_t dest_len, int
flags)
{
if (flags & STR_ASCII) {
- return push_ascii(dest, src, dest_len, flags);
+ size_t size = 0;
+ if (push_ascii(dest, src, dest_len, flags, &size)) {
+ return (ssize_t)size;
+ } else {
+ return (ssize_t)-1;
+ }
} else if (flags & STR_UNICODE) {
return push_ucs2(dest, src, dest_len, flags);
} else {
@@ -662,18 +672,18 @@ _PUBLIC_ ssize_t pull_string(char *dest, const void *src,
size_t dest_len, size_
* @param srclen length of the source string in bytes
* @param dest pointer to destination string (multibyte or singlebyte)
* @param destlen maximal length allowed for string
- * @returns the number of bytes occupied in the destination
+ * @param converted_size the number of bytes occupied in the destination
+ *
+ * @returns true on success, false on fail.
**/
-_PUBLIC_ size_t convert_string(charset_t from, charset_t to,
+_PUBLIC_ bool convert_string(charset_t from, charset_t to,
void const *src, size_t srclen,
- void *dest, size_t destlen)
+ void *dest, size_t destlen,
+ size_t *converted_size)
{
- size_t ret;
- if (!convert_string_handle(get_iconv_handle(), from, to,
+ return convert_string_handle(get_iconv_handle(), from, to,
src, srclen,
- dest, destlen, &ret))
- return -1;
- return ret;
+ dest, destlen, converted_size);
}
/**
diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c
index 9cc26da..6e20333 100644
--- a/librpc/ndr/ndr_string.c
+++ b/librpc/ndr/ndr_string.c
@@ -696,7 +696,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_charset(struct ndr_pull
*ndr, int ndr_flags,
_PUBLIC_ enum ndr_err_code ndr_push_charset(struct ndr_push *ndr, int
ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, charset_t chset)
{
- ssize_t ret, required;
+ ssize_t required;
if (NDR_BE(ndr) && chset == CH_UTF16) {
chset = CH_UTF16BE;
@@ -707,17 +707,17 @@ _PUBLIC_ enum ndr_err_code ndr_push_charset(struct
ndr_push *ndr, int ndr_flags,
NDR_PUSH_NEED_BYTES(ndr, required);
if (required) {
- ret = convert_string(CH_UNIX, chset,
+ size_t size = 0;
+ if (!convert_string(CH_UNIX, chset,
var, strlen(var),
- ndr->data+ndr->offset, required);
- if (ret == -1) {
+ ndr->data+ndr->offset, required, &size)) {
return ndr_push_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
}
/* Make sure the remaining part of the string is filled with
zeroes */
- if (ret < required) {
- memset(ndr->data+ndr->offset+ret, 0, required-ret);
+ if (size < required) {
+ memset(ndr->data+ndr->offset+size, 0, required-size);
}
}
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 94c9245..a85b2f9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -74,17 +74,18 @@ int bitmap_find(struct bitmap *bm, unsigned ofs);
void gfree_charcnv(void);
void init_iconv(void);
-size_t convert_string(charset_t from, charset_t to,
+bool convert_string(charset_t from, charset_t to,
void const *src, size_t srclen,
- void *dest, size_t destlen);
+ void *dest, size_t destlen,
+ size_t *converted_size);
bool convert_string_error(charset_t from, charset_t to,
void const *src, size_t srclen,
void *dest, size_t destlen,
size_t *converted_size);
-size_t unix_strupper(const char *src, size_t srclen, char *dest, size_t
destlen);
+bool unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen);
char *talloc_strdup_upper(TALLOC_CTX *ctx, const char *s);
char *strupper_talloc(TALLOC_CTX *ctx, const char *s);
-size_t unix_strlower(const char *src, size_t srclen, char *dest, size_t
destlen);
+bool unix_strlower(const char *src, size_t srclen, char *dest, size_t destlen);
char *talloc_strdup_lower(TALLOC_CTX *ctx, const char *s);
char *strlower_talloc(TALLOC_CTX *ctx, const char *s);
size_t ucs2_align(const void *base_ptr, const void *p, int flags);
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 76fa968..3fd574b 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -299,12 +299,12 @@ bool convert_string_error(charset_t from, charset_t to,
return convert_string_internal(from, to, src, srclen, dest, destlen,
converted_size);
}
-size_t convert_string(charset_t from, charset_t to,
+bool convert_string(charset_t from, charset_t to,
void const *src, size_t srclen,
- void *dest, size_t destlen)
+ void *dest, size_t destlen,
+ size_t *converted_size)
{
- size_t converted_size;
- bool ret = convert_string_error(from, to, src, srclen, dest, destlen,
&converted_size);
+ bool ret = convert_string_error(from, to, src, srclen, dest, destlen,
converted_size);
if(ret==false) {
const char *reason="unknown error";
@@ -344,7 +344,7 @@ size_t convert_string(charset_t from, charset_t to,
}
/* smb_panic(reason); */
}
- return ret ? converted_size : (size_t)-1;
+ return ret;
}
@@ -500,10 +500,11 @@ bool convert_string_talloc(TALLOC_CTX *ctx, charset_t
from, charset_t to,
return true;
}
-size_t unix_strupper(const char *src, size_t srclen, char *dest, size_t
destlen)
+bool unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen)
{
size_t size;
smb_ucs2_t *buffer;
+ bool ret;
if (!push_ucs2_talloc(talloc_tos(), &buffer, src, &size)) {
return (size_t)-1;
@@ -514,9 +515,9 @@ size_t unix_strupper(const char *src, size_t srclen, char
*dest, size_t destlen)
return srclen;
}
- size = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen);
+ ret = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen,
&size);
TALLOC_FREE(buffer);
- return size;
+ return ret;
}
/**
@@ -584,10 +585,11 @@ char *strupper_talloc(TALLOC_CTX *ctx, const char *s) {
}
-size_t unix_strlower(const char *src, size_t srclen, char *dest, size_t
destlen)
+bool unix_strlower(const char *src, size_t srclen, char *dest, size_t destlen)
{
size_t size;
smb_ucs2_t *buffer = NULL;
+ bool ret;
if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF16LE, src,
srclen,
(void **)(void *)&buffer, &size))
@@ -598,9 +600,9 @@ size_t unix_strlower(const char *src, size_t srclen, char
*dest, size_t destlen)
TALLOC_FREE(buffer);
return srclen;
}
- size = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen);
+ ret = convert_string(CH_UTF16LE, CH_UNIX, buffer, size, dest, destlen,
&size);
TALLOC_FREE(buffer);
- return size;
+ return ret;
}
@@ -656,7 +658,8 @@ size_t push_ascii(void *dest, const char *src, size_t
dest_len, int flags)
{
size_t src_len = strlen(src);
char *tmpbuf = NULL;
- size_t ret;
+ size_t size;
+ bool ret;
/* No longer allow a length of -1. */
if (dest_len == (size_t)-1) {
@@ -676,14 +679,14 @@ size_t push_ascii(void *dest, const char *src, size_t
dest_len, int flags)
src_len++;
}
- ret = convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len);
- if (ret == (size_t)-1 &&
+ ret = convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len,
&size);
+ if (ret == false &&
(flags & (STR_TERMINATE | STR_TERMINATE_ASCII))
&& dest_len > 0) {
((char *)dest)[0] = '\0';
}
SAFE_FREE(tmpbuf);
- return ret;
+ return ret ? size : (size_t)-1;
}
/********************************************************************
@@ -716,7 +719,8 @@ bool push_ascii_talloc(TALLOC_CTX *mem_ctx, char **dest,
const char *src, size_t
**/
size_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t
src_len, int flags)
{
- size_t ret;
+ bool ret;
+ size_t size = 0;
if (dest_len == (size_t)-1) {
/* No longer allow dest_len of -1. */
@@ -734,16 +738,16 @@ size_t pull_ascii(char *dest, const void *src, size_t
dest_len, size_t src_len,
}
}
- ret = convert_string(CH_DOS, CH_UNIX, src, src_len, dest, dest_len);
- if (ret == (size_t)-1) {
- ret = 0;
+ ret = convert_string(CH_DOS, CH_UNIX, src, src_len, dest, dest_len,
&size);
+ if (ret == false) {
+ size = 0;
dest_len = 0;
}
- if (dest_len && ret) {
+ if (dest_len && size) {
/* Did we already process the terminating zero ? */
- if (dest[MIN(ret-1, dest_len-1)] != 0) {
- dest[MIN(ret, dest_len-1)] = 0;
+ if (dest[MIN(size-1, dest_len-1)] != 0) {
+ dest[MIN(size, dest_len-1)] = 0;
}
} else {
dest[0] = 0;
@@ -858,7 +862,8 @@ size_t push_ucs2(const void *base_ptr, void *dest, const
char *src, size_t dest_
{
size_t len=0;
size_t src_len;
- size_t ret;
+ size_t size = 0;
+ bool ret;
if (dest_len == (size_t)-1) {
/* No longer allow dest_len of -1. */
@@ -881,8 +886,8 @@ size_t push_ucs2(const void *base_ptr, void *dest, const
char *src, size_t dest_
/* ucs2 is always a multiple of 2 bytes */
dest_len &= ~1;
- ret = convert_string(CH_UNIX, CH_UTF16LE, src, src_len, dest,
dest_len);
- if (ret == (size_t)-1) {
+ ret = convert_string(CH_UNIX, CH_UTF16LE, src, src_len, dest, dest_len,
&size);
+ if (ret == false) {
if ((flags & STR_TERMINATE) &&
dest &&
dest_len) {
@@ -891,7 +896,7 @@ size_t push_ucs2(const void *base_ptr, void *dest, const
char *src, size_t dest_
return len;
}
- len += ret;
+ len += size;
if (flags & STR_UPPER) {
smb_ucs2_t *dest_ucs2 = (smb_ucs2_t *)dest;
@@ -968,8 +973,9 @@ bool push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const
char *src,
size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t
dest_len, size_t src_len, int flags)
{
- size_t ret;
+ size_t size = 0;
size_t ucs2_align_len = 0;
+ bool ret;
if (dest_len == (size_t)-1) {
/* No longer allow dest_len of -1. */
@@ -1005,19 +1011,19 @@ size_t pull_ucs2(const void *base_ptr, char *dest,
const void *src, size_t dest_
if (src_len != (size_t)-1)
src_len &= ~1;
--
Samba Shared Repository
