Attachment 42823 Details for Bug 97408

[patch] gaim-libgadu-backport.patch

libgadu-backport.patch (text/plain), 2.66 KB, created by Stanislav Brabec on 2005-07-21 15:06:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Brabec

Created: 2005-07-21 15:06:34 UTC

Size: 2.66 KB

patch

obsolete

>--- src/protocols/gg/common.c
>+++ src/protocols/gg/common.c
>@@ -212,6 +212,9 @@
> {
> 	int ret;
> 
>+	if (!buf || length < 0)
>+		return NULL;
>+
> 	gg_debug(GG_DEBUG_FUNCTION, "** gg_read_line(...);\n");
> 	
> 	for (; length > 1; buf++, length--) {
>@@ -269,7 +272,7 @@
> 	const char *p, hex[] = "0123456789abcdef";
> 	char *q, *buf;
> 
>-	int size = 0;
>+	unsigned int size = 0;
> 
> 	if (!str)
> 		str = "";
>--- src/protocols/gg/libgg.c
>+++ src/protocols/gg/libgg.c
>@@ -174,13 +174,16 @@
>  *
>  *  - sock - po³±czony socket.
>  *
>- * je¶li wyst±pi³ b³±d, zwraca NULL. reszta w errno.
>+ * je¶li wyst±pi³ b³±d, zwraca NULL. reszta w errno. naleï¿½y zwrï¿½ciï¿½ uwagï¿½, ï¿½e gdy
>+ * poï¿½ï¿½czenie jest nieblokujï¿½ce, a kod bï¿½ï¿½du wynosi EAGAIN, nie udaï¿½o siï¿½
>+ * odczytaï¿½ caï¿½ego pakietu i nie naleï¿½y tego traktowaï¿½ jako bï¿½ï¿½d.
>  */
> static void *gg_recv_packet(struct gg_session *sess)
> {
> 	struct gg_header h;
> 	char *buf = NULL;
>-	int ret = 0, offset, size = 0;
>+	int ret = 0;
>+	unsigned int offset, size = 0;
> 	int sizeh = sizeof(struct gg_header);
> 
> 	gg_debug(GG_DEBUG_FUNCTION, "** gg_recv_packet(...);\n");
>@@ -209,7 +212,7 @@
> 	}
> 
> 	/* jakie¶ sensowne limity na rozmiar pakietu */
>-	if (h.length < 0 || h.length > 65535) {
>+	if (h.length > 65535) {
> 		gg_debug(GG_DEBUG_MISC, "-- invalid packet length (%d)\n", h.length);
> 		errno = ERANGE;
> 		return NULL;
>@@ -235,11 +238,20 @@
> 	while (size > 0) {
> 		ret = read(sess->fd, buf + sizeh + offset, size);
> 		gg_debug(GG_DEBUG_MISC, "-- body recv(..., %d) = %d\n", size, ret);
>+		if (!ret) {
>+			gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() body recv() failed: connection broken\n");
>+			errno = ECONNRESET;
>+			return NULL;
>+		}
> 		if (ret > -1 && ret <= size) {
> 			offset += ret;
> 			size -= ret;
> 		} else if (ret == -1) {	
>+			int errno2 = errno;
>+
> 			gg_debug(GG_DEBUG_MISC, "-- errno = %d (%s)\n", errno, strerror(errno));
>+			errno = errno2;
>+
> 			if (errno == EAGAIN) {
> 				gg_debug(GG_DEBUG_MISC, "-- %d bytes received, %d left\n", offset, size);
> 				sess->recv_buf = buf;
>@@ -291,9 +303,9 @@
> {
> 	struct gg_header *h;
> 	char *tmp;
>-	int tmp_length;
>+	unsigned int tmp_length;
> 	void *payload;
>-	int payload_length;
>+	unsigned int payload_length;
> 	va_list ap;
> 	int res;
> 
>@@ -317,11 +329,8 @@
> 	while (payload) {
> 		char *tmp2;
> 
>-		payload_length = va_arg(ap, int);
>+		payload_length = va_arg(ap, unsigned int);
> 
>-		if (payload_length < 0)
>-			gg_debug(GG_DEBUG_MISC, "// gg_send_packet() invalid payload length (%d)\n", payload_length);
>-	
> 		if (!(tmp2 = realloc(tmp, sizeof(struct gg_header) + tmp_length + payload_length))) {
>                         gg_debug(GG_DEBUG_MISC, "// gg_send_packet() not enough memory for payload\n");
> 			free(tmp);

Actions: View | Diff

Attachments on bug 97408: 42706 | 42823 | 44436