ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ncrypt: Validate existence of property before creating one. 

Signed-off-by: Santino Mazza <mazzasantino1206@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Santino Mazza 2022-02-21 12:13:41 +01:00 committed by Alexandre Julliard
parent a63ca0eb0b
commit e08c2f35f8
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/ncrypt/main.c
View File

@ -144,12 +144,12 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle)
return ret; return ret;
} }
static const struct object_property *get_object_property(struct object *object, const WCHAR *name) static struct object_property *get_object_property(struct object *object, const WCHAR *name)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < object->num_properties; i++) for (i = 0; i < object->num_properties; i++)
{ {
const struct object_property *property = &object->properties[i]; struct object_property *property = &object->properties[i];
if (!lstrcmpW(property->key, name)) return property; if (!lstrcmpW(property->key, name)) return property;
} }
return NULL; return NULL;
@ -181,17 +181,16 @@ static struct object *allocate_object(enum object_type type)
return ret; return ret;
} }
static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) struct object_property *add_object_property(struct object *object, const WCHAR *name)
{ {
struct object_property *property; struct object_property *property;
FIXME("check duplicates\n");
if (!object->num_properties) if (!object->num_properties)
{ {
if (!(object->properties = malloc(sizeof(*property)))) if (!(object->properties = malloc(sizeof(*property))))
{ {
ERR("Error allocating memory.\n"); ERR("Error allocating memory.\n");
return NTE_NO_MEMORY; return NULL;
} }
property = &object->properties[object->num_properties++]; property = &object->properties[object->num_properties++];
} }
@ -201,7 +200,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n
if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1))))
{ {
ERR("Error allocating memory.\n"); ERR("Error allocating memory.\n");
return NTE_NO_MEMORY; return NULL;
} }
object->properties = tmp; object->properties = tmp;
property = &object->properties[object->num_properties++]; property = &object->properties[object->num_properties++];
@ -211,12 +210,22 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n
if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR))))
{ {
ERR("Error allocating memory.\n"); ERR("Error allocating memory.\n");
return NTE_NO_MEMORY; return NULL;
} }
lstrcpyW(property->key, name); lstrcpyW(property->key, name);
return property;
}
static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size)
{
struct object_property *property = get_object_property(object, name);
void *tmp;
if (!property && !(property = add_object_property(object, name))) return NTE_NO_MEMORY;
property->value_size = value_size; property->value_size = value_size;
if (!(property->value = malloc(value_size))) if (!(tmp = realloc(property->value, value_size)))
{ {
ERR("Error allocating memory.\n"); ERR("Error allocating memory.\n");
free(property->key); free(property->key);
@ -224,7 +233,9 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n
return NTE_NO_MEMORY; return NTE_NO_MEMORY;
} }
property->value = tmp;
memcpy(property->value, value, value_size); memcpy(property->value, value, value_size);
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }