sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r9464: fixed a problem with child pointers copied into non-allocated mpr variables. We

Browse Source 
now use the same free technique as is used for mpr strings, rather than relying on
being a child of the variable
This commit is contained in:
Andrew Tridgell 2005-08-22 01:51:02 +00:00 committed by Gerald (Jerry) Carter
parent de66450c24
commit 3d6739eaa6
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/lib/appweb/mpr/var.c
View File

@ -181,6 +181,13 @@ static bool freeVarStorage(MprVar *vp, int force)
}
break;
case MPR_TYPE_PTR:
if (vp->allocatedData) {
vp->allocatedData = 0;
mprFree(vp->ptr);
}
break;
case MPR_TYPE_OBJECT:
#if VAR_DEBUG
/*
@ -1418,7 +1425,12 @@ static void copyVarCore(MprVar *dest, MprVar *src, int copyDepth)
case MPR_TYPE_PTR:
/* we have to reference here so talloc structures survive a
copy */
dest->ptr = talloc_reference(dest, src->ptr);
if (src->allocatedData) {
dest->ptr = talloc_reference(mprMemCtx(), src->ptr);
dest->allocatedData = 1;
} else {
dest->ptr = src->ptr;
}
break;
case MPR_TYPE_STRING_CFUNCTION:

6
source/scripting/ejs/mprutil.c
View File

@ -369,12 +369,14 @@ void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
}
/*
set a pointer in a existing MprVar, making it a child of the property
set a pointer in a existing MprVar, freeing it when the property goes away
*/
void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p)
{
mprSetVar(v, propname, mprCreatePtrVar(discard_const(p)));
talloc_steal(mprGetProperty(v, propname, NULL), p);
v = mprGetProperty(v, propname, NULL);
v->allocatedData = 1;
talloc_steal(mprMemCtx(), p);
}
/*