libgaim/protocols/zephyr/ZRecvNot.c@f3d13f21350c (annotated)
libgaim/protocols/zephyr/ZRecvNot.c
Tue, 26 Sep 2006 17:38:09 +0000
- author
- Richard Laager <rlaager@pidgin.im>
- date
- Tue, 26 Sep 2006 17:38:09 +0000
- changeset 14686
- f3d13f21350c
- parent 14254
- 77edc7a6191a
- child 20470
- 77693555855f
- permissions
- -rw-r--r--
[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 ZReceiveNotice function. | |
| 3 | * | |
| 4 | * Created by: Robert French | |
| 5 | * | |
| 6 | * Copyright (c) 1987,1988 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 ZReceiveNotice(notice, from) | |
| 14 | ZNotice_t *notice; | |
| 15 | struct sockaddr_in *from; | |
| 16 | { | |
| 17 | char *buffer; | |
| 18 | struct _Z_InputQ *nextq; | |
| 19 | int len, auth; | |
| 20 | Code_t retval; | |
| 21 | ||
| 22 | if ((retval = Z_WaitForComplete()) != ZERR_NONE) | |
| 23 | return (retval); | |
| 24 | ||
| 25 | nextq = Z_GetFirstComplete(); | |
| 26 | ||
| 10690 | 27 | if (!nextq) |
| 28 | return (ENOMEM); | |
| 29 | ||
| 2086 | 30 | len = nextq->packet_len; |
| 31 | ||
| 32 | if (!(buffer = (char *) malloc((unsigned) len))) | |
| 33 | return (ENOMEM); | |
| 34 | ||
| 35 | if (from) | |
| 36 | *from = nextq->from; | |
| 37 | ||
| 38 | (void) memcpy(buffer, nextq->packet, len); | |
| 39 | ||
| 40 | auth = nextq->auth; | |
| 41 | Z_RemQueue(nextq); | |
| 42 | ||
| 43 | if ((retval = ZParseNotice(buffer, len, notice)) != ZERR_NONE) | |
| 44 | return (retval); | |
| 45 | notice->z_checked_auth = auth; | |
| 46 | return ZERR_NONE; | |
| 47 | } |
