mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 681114 - Diagnostic patch to crash earlier when cairo_array is corrupted. r=jmuizelaar
--HG-- rename : b2g/config/mozconfigs/linux32/nightly => b2g/config/mozconfigs/linux32/debug rename : mobile/android/config/mozconfigs/android-x86/debug => mobile/android/config/mozconfigs/android/debug rename : mobile/android/config/mozconfigs/android-armv6/l10n-nightly => mobile/android/config/mozconfigs/android/l10n-nightly rename : mobile/android/config/mozconfigs/android-x86/l10n-release => mobile/android/config/mozconfigs/android/l10n-release rename : mobile/android/config/mozconfigs/android-armv6/nightly => mobile/android/config/mozconfigs/android/nightly rename : mobile/android/config/mozconfigs/android-x86/release => mobile/android/config/mozconfigs/android/release extra : rebase_source : e2f84d0e8df8dcd3aed4301f8911eeb18412601d
This commit is contained in:
parent
b867561932
commit
5da6ad9ba8
@ -84,7 +84,7 @@ _cairo_array_init_snapshot (cairo_array_t *array,
|
||||
|
||||
array->is_snapshot = TRUE;
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
}
|
||||
|
||||
@ -102,7 +102,7 @@ _cairo_array_fini (cairo_array_t *array)
|
||||
if (array->is_snapshot)
|
||||
return;
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
if (array->elements) {
|
||||
@ -166,7 +166,7 @@ _cairo_array_grow_by (cairo_array_t *array, unsigned int additional)
|
||||
|
||||
*array->elements = new_elements;
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
return CAIRO_STATUS_SUCCESS;
|
||||
@ -188,7 +188,7 @@ _cairo_array_truncate (cairo_array_t *array, unsigned int num_elements)
|
||||
if (num_elements < array->num_elements)
|
||||
array->num_elements = num_elements;
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
}
|
||||
|
||||
@ -233,7 +233,7 @@ _cairo_array_index (cairo_array_t *array, unsigned int index)
|
||||
|
||||
assert (index < array->num_elements);
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
return (void *) &(*array->elements)[index * array->element_size];
|
||||
@ -304,7 +304,7 @@ _cairo_array_append_multiple (cairo_array_t *array,
|
||||
|
||||
memcpy (dest, elements, num_elements * array->element_size);
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
return CAIRO_STATUS_SUCCESS;
|
||||
@ -342,7 +342,7 @@ _cairo_array_allocate (cairo_array_t *array,
|
||||
|
||||
array->num_elements += num_elements;
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
return CAIRO_STATUS_SUCCESS;
|
||||
@ -402,7 +402,7 @@ _cairo_user_data_array_fini (cairo_user_data_array_t *array)
|
||||
{
|
||||
unsigned int num_slots;
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
num_slots = array->num_elements;
|
||||
@ -417,7 +417,7 @@ _cairo_user_data_array_fini (cairo_user_data_array_t *array)
|
||||
} while (--num_slots);
|
||||
}
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
_cairo_array_fini (array);
|
||||
@ -446,7 +446,7 @@ _cairo_user_data_array_get_data (cairo_user_data_array_t *array,
|
||||
if (array == NULL)
|
||||
return NULL;
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
num_slots = array->num_elements;
|
||||
@ -510,7 +510,7 @@ _cairo_user_data_array_set_data (cairo_user_data_array_t *array,
|
||||
}
|
||||
}
|
||||
|
||||
if (array->num_elements != 0 && array->elements == NULL)
|
||||
if (array->num_elements != 0 && *array->elements == NULL)
|
||||
abort();
|
||||
|
||||
if (slot) {
|
||||
|
Loading…
Reference in New Issue
Block a user