diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-06-18 11:16:16 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-06-19 11:32:01 +1000 |
| commit | 2627c6c0c2d3d96b3d458092ba8b090447a76a61 (patch) | |
| tree | 9b3beebf9c689901eed3cd71a344809e36ca5436 /source4/dsdb/schema | |
| parent | 0376d056e58d76b7792a5512d84c07f703838b4d (diff) | |
| download | samba-2627c6c0c2d3d96b3d458092ba8b090447a76a61.tar.gz samba-2627c6c0c2d3d96b3d458092ba8b090447a76a61.tar.bz2 samba-2627c6c0c2d3d96b3d458092ba8b090447a76a61.zip | |
Fixed some uninitialised variables
I tried hard to not change the program logic. Should fix bug #6439.
Diffstat (limited to 'source4/dsdb/schema')
| -rw-r--r-- | source4/dsdb/schema/schema_syntax.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 4ff861766f..c26b407c1f 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -829,17 +829,14 @@ static WERROR dsdb_syntax_UNICODE_ldb_to_drsuapi(struct ldb_context *ldb, W_ERROR_HAVE_NO_MEMORY(blobs); for (i=0; i < in->num_values; i++) { - ssize_t ret; - out->value_ctr.values[i].blob = &blobs[i]; - if (!convert_string_talloc_convenience(blobs, schema->iconv_convenience, CH_UNIX, CH_UTF16, - in->values[i].data, - in->values[i].length, - (void **)&blobs[i].data, NULL, false)) { - return WERR_FOOBAR; + if (!convert_string_talloc_convenience(blobs, + schema->iconv_convenience, CH_UNIX, CH_UTF16, + in->values[i].data, in->values[i].length, + (void **)&blobs[i].data, &blobs[i].length, false)) { + return WERR_FOOBAR; } - blobs[i].length = ret; } return WERR_OK; |