pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

Fixed crash for DCC receiver when resuming a file (bug #17885), fixed DCC error for sender when receiver cancels DCC (bug #17852)

Browse Source
This commit is contained in:
Sebastien Helleu
2006-09-30 06:52:52 +00:00
parent 9f035d8f91
commit 80a76f65f6
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3 -1
View File
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2006-09-23
ChangeLog - 2006-09-30
Version 0.2.1 (under dev!):
* fixed crash for DCC receiver when resuming a file (bug #17885)
* fixed DCC error for sender when receiver cancels DCC (bug #17852)
* fixed random crash with /upgrade command (error when loading buffers)
* fixed buffer search by server/channel: now if only channel is specified,
a channel of another server can be found
src/irc/irc-dcc.c
+4 -3
View File
@@ -1421,7 +1421,7 @@ dcc_file_send_child (t_irc_dcc *ptr_dcc)
if ((num_read < 1) &&
((num_read != -1) || (errno != EAGAIN)))
{
dcc_file_write_pipe (ptr_dcc, DCC_FAILED, DCC_ERROR_READ_LOCAL);
dcc_file_write_pipe (ptr_dcc, DCC_FAILED, DCC_ERROR_SEND_BLOCK);
return;
}
if (num_read == 4)
@@ -1462,7 +1462,7 @@ dcc_file_send_child (t_irc_dcc *ptr_dcc)
usleep (1000);
else
{
dcc_file_write_pipe (ptr_dcc, DCC_FAILED, DCC_ERROR_READ_LOCAL);
dcc_file_write_pipe (ptr_dcc, DCC_FAILED, DCC_ERROR_SEND_BLOCK);
return;
}
}
@@ -1830,7 +1830,8 @@ dcc_handle ()
}
if (ptr_dcc->type == DCC_FILE_RECV)
{
dcc_file_child_read (ptr_dcc);
if (ptr_dcc->child_read != -1)
dcc_file_child_read (ptr_dcc);
}
}
weechat/ChangeLog
+3 -1
View File
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2006-09-23
ChangeLog - 2006-09-30
Version 0.2.1 (under dev!):
* fixed crash for DCC receiver when resuming a file (bug #17885)
* fixed DCC error for sender when receiver cancels DCC (bug #17852)
* fixed random crash with /upgrade command (error when loading buffers)
* fixed buffer search by server/channel: now if only channel is specified,
a channel of another server can be found
weechat/src/irc/irc-dcc.c
+4 -3
View File
@@ -1421,7 +1421,7 @@ dcc_file_send_child (t_irc_dcc *ptr_dcc)
if ((num_read < 1) &&
((num_read != -1) || (errno != EAGAIN)))
{
dcc_file_write_pipe (ptr_dcc, DCC_FAILED, DCC_ERROR_READ_LOCAL);
dcc_file_write_pipe (ptr_dcc, DCC_FAILED, DCC_ERROR_SEND_BLOCK);
return;
}
if (num_read == 4)
@@ -1462,7 +1462,7 @@ dcc_file_send_child (t_irc_dcc *ptr_dcc)
usleep (1000);
else
{
dcc_file_write_pipe (ptr_dcc, DCC_FAILED, DCC_ERROR_READ_LOCAL);
dcc_file_write_pipe (ptr_dcc, DCC_FAILED, DCC_ERROR_SEND_BLOCK);
return;
}
}
@@ -1830,7 +1830,8 @@ dcc_handle ()
}
if (ptr_dcc->type == DCC_FILE_RECV)
{
dcc_file_child_read (ptr_dcc);
if (ptr_dcc->child_read != -1)
dcc_file_child_read (ptr_dcc);
}
}