mirror of
https://github.com/samba-team/samba.git
synced 2025-10-31 12:23:52 +03:00
r9770: Couple other bugfixes
Update TODO-list
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
7f9efaceb6
commit
d9541535e3
@@ -264,6 +264,7 @@ static int ejs_base64encode(MprVarHandle eid, int argc, struct MprVar **argv)
|
||||
}
|
||||
|
||||
blob = mprToDataBlob(argv[0]);
|
||||
mprAssert(blob);
|
||||
ret = ldb_base64_encode(mprMemCtx(), (char *)blob->data, blob->length);
|
||||
|
||||
if (!ret) {
|
||||
@@ -297,7 +298,10 @@ static int ejs_base64decode(MprVarHandle eid, int argc, struct MprVar **argv)
|
||||
if (ret == -1) {
|
||||
mpr_Return(eid, mprCreateUndefinedVar());
|
||||
} else {
|
||||
mpr_Return(eid, mprData((uint8_t *)tmp, ret));
|
||||
DATA_BLOB blob;
|
||||
blob.data = (uint8_t *)tmp;
|
||||
blob.length = ret;
|
||||
mpr_Return(eid, mprDataBlob(blob));
|
||||
}
|
||||
|
||||
talloc_free(tmp);
|
||||
|
||||
Reference in New Issue
Block a user