fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-07 05:08:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initialize return values for cairo_*_extents in case of error

Browse source 
Previously we left the return values alone, which set the
user up for a nasty trap, (using potentially uninitialized
values with no indication that there was an error). So now
we initialize these values to 0.0 if the cairo_t is in error.

The fixed functions include:

	cairo_path_extents
	cairo_stroke_extents
	cairo_fill_extents
	cairo_clip_extents
	cairo_font_extents
This commit is contained in:
Carl Worth 2008-01-29 05:40:39 -08:00
parent 6bdba4b4be
commit 8493222357
1 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/cairo.c
View file

@ -1904,8 +1904,18 @@ void
cairo_path_extents (cairo_t *cr,
double *x1, double *y1, double *x2, double *y2)
{
if (cr->status)
if (cr->status) {
if (x1)
*x1 = 0.0;
if (y1)
*y1 = 0.0;
if (x2)
*x2 = 0.0;
if (y2)
*y2 = 0.0;
return;
}
_cairo_gstate_path_extents (cr->gstate,
cr->path,
@ -2301,8 +2311,18 @@ cairo_stroke_extents (cairo_t *cr,
{
cairo_status_t status;
if (cr->status)
if (cr->status) {
if (x1)
*x1 = 0.0;
if (y1)
*y1 = 0.0;
if (x2)
*x2 = 0.0;
if (y2)
*y2 = 0.0;
return;
}
status = _cairo_gstate_stroke_extents (cr->gstate,
cr->path,
@ -2337,8 +2357,18 @@ cairo_fill_extents (cairo_t *cr,
{
cairo_status_t status;
if (cr->status)
if (cr->status) {
if (x1)
*x1 = 0.0;
if (y1)
*y1 = 0.0;
if (x2)
*x2 = 0.0;
if (y2)
*y2 = 0.0;
return;
}
status = _cairo_gstate_fill_extents (cr->gstate,
cr->path,
@ -2462,8 +2492,18 @@ cairo_clip_extents (cairo_t *cr,
{
cairo_status_t status;
if (cr->status)
if (cr->status) {
if (x1)
*x1 = 0.0;
if (y1)
*y1 = 0.0;
if (x2)
*x2 = 0.0;
if (y2)
*y2 = 0.0;
return;
}
status = _cairo_gstate_clip_extents (cr->gstate, x1, y1, x2, y2);
if (status)
@ -2561,6 +2601,12 @@ cairo_font_extents (cairo_t *cr,
{
cairo_status_t status;
extents->ascent = 0.0;
extents->descent = 0.0;
extents->height = 0.0;
extents->max_x_advance = 0.0;
extents->max_y_advance = 0.0;
if (cr->status)
return;