fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-06-19 11:18:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pdf-stdio-write-errors' into 'master'

Browse source 
pdf: Properly pass on stdio write errors

See merge request cairo/cairo!210
This commit is contained in:
Adrian Johnson 2021-07-24 08:08:44 +00:00
commit d12e55672c
4 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cairo-pdf-interchange.c
View file

@ -1515,7 +1515,7 @@ _cairo_pdf_interchange_free_outlines (cairo_pdf_surface_t *surface)
_cairo_array_fini (&ic->outline);
}
cairo_int_status_t
void
_cairo_pdf_interchange_fini (cairo_pdf_surface_t *surface)
{
cairo_pdf_interchange_t *ic = &surface->interchange;
@ -1539,8 +1539,6 @@ _cairo_pdf_interchange_fini (cairo_pdf_surface_t *surface)
free (ic->docinfo.creator);
free (ic->docinfo.create_date);
free (ic->docinfo.mod_date);
return CAIRO_STATUS_SUCCESS;
}
cairo_int_status_t

2
src/cairo-pdf-surface-private.h
View file

@ -355,7 +355,7 @@ _cairo_utf8_to_pdf_string (const char *utf8, char **str_out);
cairo_private cairo_int_status_t
_cairo_pdf_interchange_init (cairo_pdf_surface_t *surface);
cairo_private cairo_int_status_t
cairo_private void
_cairo_pdf_interchange_fini (cairo_pdf_surface_t *surface);
cairo_private cairo_int_status_t

4
src/cairo-pdf-surface.c
View file

@ -2329,7 +2329,9 @@ _cairo_pdf_surface_finish (void *abstract_surface)
_cairo_surface_clipper_reset (&surface->clipper);
return _cairo_pdf_interchange_fini (surface);
_cairo_pdf_interchange_fini (surface);
return status;
}
static cairo_int_status_t

26
test/create-for-stream.c
View file

@ -29,6 +29,10 @@
#include <string.h>
#include <errno.h>
#ifndef _WIN32
#include <unistd.h>
#endif
#if CAIRO_HAS_PS_SURFACE
#include <cairo-ps.h>
#endif
@ -165,11 +169,31 @@ test_surface (const cairo_test_context_t *ctx,
if (status != CAIRO_STATUS_WRITE_ERROR) {
cairo_test_log (ctx,
"%s: Error: expected \"write error\", but received \"%s\".\n",
"%s: Error: expected \"write error\" from bad_write(), but received \"%s\".\n",
backend, cairo_status_to_string (status));
return CAIRO_TEST_FAILURE;
}
/* test propagation of file errors - for now this is unix-only */
#ifndef _WIN32
if (access("/dev/full", W_OK) == 0) {
surface = file_constructor ("/dev/full", WIDTH_IN_POINTS, HEIGHT_IN_POINTS);
cairo_surface_finish (surface);
status = cairo_surface_status (surface);
cairo_surface_destroy (surface);
if (status != CAIRO_STATUS_WRITE_ERROR) {
cairo_test_log (ctx,
"%s: Error: expected \"write error\" from /dev/full, but received \"%s\".\n",
backend, cairo_status_to_string (status));
return CAIRO_TEST_FAILURE;
}
} else {
cairo_test_log (ctx,
"/dev/full does not exist; skipping write test.\n");
}
#endif
/* construct the real surface */
wc.ctx = ctx;
wc.status = CAIRO_TEST_SUCCESS;