From 818b4956eaa4b7140579d61b372c65f097a2d008 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 5 Mar 2003 17:52:58 +0000 Subject: [PATCH] * cons.handler.c (console_init) [__FreeBSD__]: Fix the amount of allocated memory. (console_save) [__FreeBSD__]: Doen't exit on error, just return. --- src/ChangeLog | 6 ++++++ src/cons.handler.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4440caabc..646d80609 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2003-03-05 Max Khon + + * cons.handler.c (console_init) [__FreeBSD__]: Fix the amount of + allocated memory. + (console_save) [__FreeBSD__]: Doen't exit on error, just return. + 2003-03-05 Pavel Roskin * cons.handler.c (show_console_contents_freebsd): Rewrite diff --git a/src/cons.handler.c b/src/cons.handler.c index cc4e58f68..c37898e3d 100644 --- a/src/cons.handler.c +++ b/src/cons.handler.c @@ -403,7 +403,7 @@ console_init (void) screen_shot.xsize = screen_info.mv_csz; screen_shot.ysize = screen_info.mv_rsz; if ((screen_shot.buf = - g_malloc (screen_info.mv_csz * screen_info.mv_rsz)) == NULL) + g_malloc (screen_info.mv_csz * screen_info.mv_rsz * 2)) == NULL) return; console_flag = 1; @@ -499,7 +499,7 @@ console_save (void) if (ioctl (FD_OUT, GIO_SCRNMAP, &map) == -1) { console_shutdown (); - exit (1); + return; } for (i = 0; i < 256; i++) {