comparison src/dialogs.c @ 79:bfdc427b936d

[gaim-migrate @ 89] I'll save time and just post the email :-) Summary of changes: * Misc malloc/free cleanups, use g_malloc more places and other small stuff (e.g. lineardata not being freed in the error case in sound.c) * Misc signed/unsigned cleanups (use size_t more often) * read() can return -1 at any point, check return values more rigorously (read_rv variables used for this) * In can_play_audio, stat requires a pointer to an allocated stat_buf (the address of an automatic variable) * escape_text needs a buffer at least 4 times the size of the text being passed in (not 2 times); I can force core dumps with lots of newlines otherwise * There's a debug statement in netscape_command (browser.c) that was printf("Hello%d\n"); with no int for the %d; I threw in a getppid(), but the statement should probably come out eventually. Thanks, G Sumner Hayes! committer: Tailor Script <[e-mail]>

78:66c5a24b62ec

	g_snprintf(current_user->user_info, sizeof(current_user->user_info), "%s", junk);
		
	save_prefs();

        buf = g_malloc(strlen(current_user->user_info) * 2);
        g_snprintf(buf, strlen(current_user->user_info) * 2, "%s", current_user->user_info);
        escape_text(buf);
        serv_set_info(buf);
        g_free(buf);
	g_free(junk);

	char *send = g_malloc(256);
	char *file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(ft->window));
	char *buf;
	char *header;
	int hdrlen;
	char bmagic[5];
	struct sockaddr_in sin;
	int rcv;
        gint hdrtype, encrypt, compress, totfiles, filesleft;
        gint totparts, partsleft, totsize, size, modtime, checksum;

	sin.sin_port = htons(ft->port);
	
	ft->fd = socket(AF_INET, SOCK_STREAM, 0);
	
	if (ft->fd <= -1 || connect(ft->fd, (struct sockaddr_in *)&sin, sizeof(sin))) {
		return;
		/*cancel */
	}

	rcv = 0;
	header = g_malloc(6);
	while (rcv != 6) {
		rcv += read(ft->fd, header + rcv, 6 - rcv);
		while(gtk_events_pending())
			gtk_main_iteration();
	}

	strncpy(bmagic, header, 4);

	header = g_malloc(hdrlen+1);

	rcv = 0;

	while (rcv != hdrlen) {
		rcv += read(ft->fd, header + rcv, hdrlen - rcv);
		while(gtk_events_pending())
			gtk_main_iteration();
	}

	header[hdrlen] = 0;

79:bfdc427b936d

	g_snprintf(current_user->user_info, sizeof(current_user->user_info), "%s", junk);
		
	save_prefs();

        buf = g_malloc(strlen(current_user->user_info) * 4);
        g_snprintf(buf, strlen(current_user->user_info) * 2, "%s", current_user->user_info);
        escape_text(buf);
        serv_set_info(buf);
        g_free(buf);
	g_free(junk);

	char *send = g_malloc(256);
	char *file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(ft->window));
	char *buf;
	char *header;
	int hdrlen;
	int read_rv;
	char bmagic[5];
	struct sockaddr_in sin;
	int rcv;
        gint hdrtype, encrypt, compress, totfiles, filesleft;
        gint totparts, partsleft, totsize, size, modtime, checksum;

	sin.sin_port = htons(ft->port);
	
	ft->fd = socket(AF_INET, SOCK_STREAM, 0);
	
	if (ft->fd <= -1 || connect(ft->fd, (struct sockaddr_in *)&sin, sizeof(sin))) {
	        g_free(buf);
		return;
		/*cancel */
	}

	rcv = 0;
	header = g_malloc(6);
	while (rcv != 6) {
		read_rv = read(ft->fd, header + rcv, 6 - rcv);
		if(read_rv < 0) {
			g_free(header);
			g_free(buf);
			return;
		}
		rcv += read_rv;
		while(gtk_events_pending())
			gtk_main_iteration();
	}

	strncpy(bmagic, header, 4);

	header = g_malloc(hdrlen+1);

	rcv = 0;

	while (rcv != hdrlen) {
		read_rv = read(ft->fd, header + rcv, hdrlen - rcv);
		if(read_rv < 0) {
			g_free(header);
			g_free(buf);
			return;
		}
		rcv += read_rv;
		while(gtk_events_pending())
			gtk_main_iteration();
	}

	header[hdrlen] = 0;