From da14e74a6d66a526ebc0ecdc32e6008f1c5c424e Mon Sep 17 00:00:00 2001 From: "Evgeny Grechnikov (Diamond)" Date: Thu, 14 Feb 2008 16:28:40 +0000 Subject: [PATCH] Bugfix in boot screen: avoid hangup in some situations git-svn-id: svn://kolibrios.org@738 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/boot/bootvesa.inc | 4 +++- kernel/trunk/network/socket.inc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/trunk/boot/bootvesa.inc b/kernel/trunk/boot/bootvesa.inc index d80026118..4892f46e0 100644 --- a/kernel/trunk/boot/bootvesa.inc +++ b/kernel/trunk/boot/bootvesa.inc @@ -386,7 +386,9 @@ check_first_parm: .next_step: sub ax,size_of_step*long_v_table cmp ax,modes_table - jb .zerro + jae @f + mov ax,modes_table +@@: mov word[home_cursor],ax push word [preboot_graph] diff --git a/kernel/trunk/network/socket.inc b/kernel/trunk/network/socket.inc index ea1947a7e..9d197ddf9 100644 --- a/kernel/trunk/network/socket.inc +++ b/kernel/trunk/network/socket.inc @@ -343,8 +343,10 @@ sot_exit: ; ;*************************************************************************** socket_close: - Index2RealAddr ebx mov eax, 0xFFFFFFFF ; assume this operation will fail.. + cmp ebx, NUM_SOCKETS + jae sc_exit + Index2RealAddr ebx cmp [ebx + SOCKET.Status], dword SOCK_EMPTY jz sc_exit