comparison src/util.c @ 7667:30593bf56e71

[gaim-migrate @ 8311] (23:56:25) shx: LSchiere: there's something wrong in my patch (23:56:34) Luke: okay (23:56:38) Luke: what's that (23:57:45) shx: I forgot to add a '0' a the end of a string (23:57:56) shx: in the gaim_mime_decode_field funcition (23:59:35) Luke: where in that? (00:00:16) shx: at the end, just before this (00:00:18) shx: if (*unencoded_start) (00:00:19) shx: n = strcpy(n, unencoded_start); (00:00:27) shx: whould be this (00:00:28) shx: *n = '\0'; (00:01:05) Luke: so you are just setting it to NULL (00:01:53) Luke: i don't understand why you need that n set at all inside that if, since you just return new on the next line down (00:03:35) shx: I doing some test right now, but I remember I added that because I had of some errors (00:05:04) Luke: i think what you may be hitting is a functional work around for not properly initializing variables, something that shouldn't work but does. because you shouldn't need to set something just before you return unless you are returning IT (or unless you are using staticly declared memory, in which case you might concievably be using that variable again when you next enter the function (00:05:55) shx: no (00:06:18) shx: n is a pointer to the end of the string, and changes as the while goes on (00:06:37) Luke: ah (00:06:42) shx: n doesn't matter (00:07:01) Luke: so should the *n = '\0' be inside the if or outside it? (00:07:30) shx: before the if (00:07:44) shx: *n = '\0'; (00:07:45) shx: if (*unencoded_start) (00:07:45) shx: n = strcpy(n, unencoded_start); (00:08:07) shx: in the case there is no *unencoded_start committer: Tailor Script <[e-mail]>

7666:25488bd0d461

	*n = '\0';

	if (size)
		*size = n - new;
	
	/* Resize to take less space */
	/* new = realloc(new, n - new); */

	*data = new;
}

		gaim_quotedp_decode(text, &decoded, &len);
	else if (g_ascii_strcasecmp(encoding, "B") == 0)
		gaim_base64_decode(text, &decoded, &len);
	else
		return NULL;
	
	
	converted = g_convert(decoded, len, OUT_CHARSET, charset, NULL, NULL, NULL);
	g_free(decoded);

	return converted;
}

		unencoded_start = cur)
	{
		int len;
		char *token;
		GQueue *tokens = g_queue_new();
		
		for (cur += 2, mark = cur; *cur; cur++) {
			if (*cur == '?') {
				token = g_strndup(mark, cur - mark);
				g_queue_push_head(tokens, token);

				mark = (cur + 1);
				
				if (*mark == '=')
					break;
			} else {
				if ((tokens->length == 2) && (*cur == ' '))
					break;

			n = strncpy(n, unencoded_start, len) + len;

			charset = g_queue_pop_tail(tokens);
			encoding = g_queue_pop_tail(tokens);
			text = g_queue_pop_tail(tokens);
			
			if ((decoded = gaim_mime_decode_word(charset, encoding, text))) {
				len = strlen(decoded);
				n = strncpy(n, decoded, len) + len;
				g_free(decoded);
			}
			
			g_free(charset);
			g_free(encoding);
			g_free(text);
		} else {
			len = cur - unencoded_start;
			n = strncpy(n, unencoded_start, len) + len;
			
			while ((token = g_queue_pop_tail(tokens)))
				g_free(token);
		}
		
		g_queue_free(tokens);
	}

	if (*unencoded_start)
		n = strcpy(n, unencoded_start);

	return new;

7667:30593bf56e71

	*n = '\0';

	if (size)
		*size = n - new;

	/* Resize to take less space */
	/* new = realloc(new, n - new); */

	*data = new;
}

		gaim_quotedp_decode(text, &decoded, &len);
	else if (g_ascii_strcasecmp(encoding, "B") == 0)
		gaim_base64_decode(text, &decoded, &len);
	else
		return NULL;


	converted = g_convert(decoded, len, OUT_CHARSET, charset, NULL, NULL, NULL);
	g_free(decoded);

	return converted;
}

		unencoded_start = cur)
	{
		int len;
		char *token;
		GQueue *tokens = g_queue_new();

		for (cur += 2, mark = cur; *cur; cur++) {
			if (*cur == '?') {
				token = g_strndup(mark, cur - mark);
				g_queue_push_head(tokens, token);

				mark = (cur + 1);

				if (*mark == '=')
					break;
			} else {
				if ((tokens->length == 2) && (*cur == ' '))
					break;

			n = strncpy(n, unencoded_start, len) + len;

			charset = g_queue_pop_tail(tokens);
			encoding = g_queue_pop_tail(tokens);
			text = g_queue_pop_tail(tokens);

			if ((decoded = gaim_mime_decode_word(charset, encoding, text))) {
				len = strlen(decoded);
				n = strncpy(n, decoded, len) + len;
				g_free(decoded);
			}

			g_free(charset);
			g_free(encoding);
			g_free(text);
		} else {
			len = cur - unencoded_start;
			n = strncpy(n, unencoded_start, len) + len;

			while ((token = g_queue_pop_tail(tokens)))
				g_free(token);
		}

		g_queue_free(tokens);
	}

	*n = '\0';

	if (*unencoded_start)
		n = strcpy(n, unencoded_start);

	return new;