зеркало из https://github.com/mozilla/gecko-dev.git
Bug 624198 - Don't use fwprintf with char* format. Flush stderr so that all error messages appears before exit. r=vlad a=jst
This commit is contained in:
Родитель
f7f0158774
Коммит
31e31cba9f
|
@ -164,6 +164,8 @@ pattern_get_surface-no-error.patch: Don't put a pattern into error if cairo_patt
|
|||
|
||||
missing-cairo-clip-init.diff: Missing cairo_clip_init call in cairo_gstate_show_text_glyphs lead to crash
|
||||
|
||||
fix-cairo-win32-print-gdi-error.diff: Don't use fwprintf with char* format. Flush stderr so that all error messages appears before exit.
|
||||
|
||||
==== pixman patches ====
|
||||
|
||||
pixman-android-cpu-detect.patch: Add CPU detection support for Android, where we can't reliably access /proc/self/auxv.
|
||||
|
|
|
@ -100,10 +100,11 @@ _cairo_win32_print_gdi_error (const char *context)
|
|||
0, NULL)) {
|
||||
fprintf (stderr, "%s: Unknown GDI error", context);
|
||||
} else {
|
||||
fwprintf (stderr, "%S: %s", context, (char *)lpMsgBuf);
|
||||
fprintf (stderr, "%s: %S", context, (char *)lpMsgBuf);
|
||||
|
||||
LocalFree (lpMsgBuf);
|
||||
}
|
||||
fflush(stderr);
|
||||
|
||||
/* We should switch off of last_status, but we'd either return
|
||||
* CAIRO_STATUS_NO_MEMORY or CAIRO_STATUS_UNKNOWN_ERROR and there
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cairo-win32-surface.c
|
||||
--- a/gfx/cairo/cairo/src/cairo-win32-surface.c
|
||||
+++ b/gfx/cairo/cairo/src/cairo-win32-surface.c
|
||||
@@ -95,20 +95,21 @@ _cairo_win32_print_gdi_error (const char
|
||||
FORMAT_MESSAGE_FROM_SYSTEM,
|
||||
NULL,
|
||||
last_error,
|
||||
MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||
(LPSTR) &lpMsgBuf,
|
||||
0, NULL)) {
|
||||
fprintf (stderr, "%s: Unknown GDI error", context);
|
||||
} else {
|
||||
- fwprintf (stderr, "%S: %s", context, (char *)lpMsgBuf);
|
||||
+ fprintf (stderr, "%s: %S", context, (char *)lpMsgBuf);
|
||||
|
||||
LocalFree (lpMsgBuf);
|
||||
}
|
||||
+ fflush(stderr);
|
||||
|
||||
/* We should switch off of last_status, but we'd either return
|
||||
* CAIRO_STATUS_NO_MEMORY or CAIRO_STATUS_UNKNOWN_ERROR and there
|
||||
* is no CAIRO_STATUS_UNKNOWN_ERROR.
|
||||
*/
|
||||
|
||||
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
|
||||
}
|
Загрузка…
Ссылка в новой задаче