Tue, 26 Sep 2006 17:38:09 +0000
[gaim-migrate @ 17356]
After the comments on gaim-devel about 'bad' code, I looked into the function referenced. It appears that yahoo_buddy_icon_upload_connected() is only called as a callback. It's registered from yahoo_buddy_icon_upload(). yahoo_buddy_icon_upload() is only called twice. In neither case can a NULL make it down to yahoo_buddy_icon_upload_connected(). As this is an exceptional case rather than a normal one, a g_return_if_fail() is more appropriate. That adds logging, makes the intent clearer, and will help the Coverity software detect violations of this assumption.
| 2086 | 1 | /* This file is part of the Project Athena Zephyr Notification System. |
| 2 | * It contains source for ZPeekPacket function. | |
| 3 | * | |
| 4 | * Created by: Robert French | |
| 5 | * | |
| 6 | * Copyright (c) 1987 by the Massachusetts Institute of Technology. | |
| 7 | * For copying and distribution information, see the file | |
| 8 | * "mit-copyright.h". | |
| 9 | */ | |
| 10 | ||
|
8792
b0645c9dc276
[gaim-migrate @ 9554]
Christian Hammond <chipx86@chipx86.com>
parents:
2086
diff
changeset
|
11 | #include "internal.h" |
| 2086 | 12 | |
| 13 | Code_t ZPeekPacket(buffer, ret_len, from) | |
| 14 | char **buffer; | |
| 15 | int *ret_len; | |
| 16 | struct sockaddr_in *from; | |
| 17 | { | |
| 18 | Code_t retval; | |
| 19 | struct _Z_InputQ *nextq; | |
| 20 | ||
| 21 | if ((retval = Z_WaitForComplete()) != ZERR_NONE) | |
| 22 | return (retval); | |
| 23 | ||
| 24 | nextq =Z_GetFirstComplete(); | |
| 25 | ||
| 26 | *ret_len = nextq->packet_len; | |
| 27 | ||
| 28 | if (!(*buffer = (char *) malloc((unsigned) *ret_len))) | |
| 29 | return (ENOMEM); | |
| 30 | ||
| 31 | (void) memcpy(*buffer, nextq->packet, *ret_len); | |
| 32 | ||
| 33 | if (from) | |
| 34 | *from = nextq->from; | |
| 35 | ||
| 36 | return (ZERR_NONE); | |
| 37 | } |