comparison libpurple/plugins/log_reader.c @ 20910:54d232b52607

Since we are looking at the return value of fread, it actually matters that we use the correct values for the size of a single data item and the number of items to read.

20909:feca1fd51b57

					if (!handle) {
						g_free(filename);
						continue;
					}

					rd = fread(contents, 56, 1, handle) == 0;
					fclose(handle);
					contents[rd] = '\0';

					/* XXX: This is fairly inflexible. */
					contents2 = contents;

					if (!handle) {
						g_free(filename);
						continue;
					}

					rd = fread(contents, 13, 1, handle);
					fclose(handle);
					contents[rd] = '\0';

					contents2 = contents;
					while (*contents2 && *contents2 != '(')

	read = g_malloc(data->length + 2);

	file = g_fopen(data->path, "rb");
	fseek(file, data->offset, SEEK_SET);
	data->length = fread(read, data->length, 1, file);
	fclose(file);

	if (read[data->length-1] == '\n') {
		read[data->length] = '\0';
	} else {

	g_return_val_if_fail(file != NULL, g_strdup(""));

	contents = g_malloc(data->length + 2);

	fseek(file, data->offset, SEEK_SET);
	data->length = fread(contents, data->length, 1, file);
	fclose(file);

	contents[data->length] = '\n';
	contents[data->length + 1] = '\0';

	file = g_fopen(data->path, "rb");
	g_return_val_if_fail(file != NULL, g_strdup(""));
	
	fseek(file, data->offset, SEEK_SET);
	data->length = fread(contents, data->length, 1, file);
	fclose(file);

	contents[data->length] = '\n';
	contents[data->length + 1] = '\0';

20910:54d232b52607

					if (!handle) {
						g_free(filename);
						continue;
					}

					rd = fread(contents, 1, 56, handle) == 0;
					fclose(handle);
					contents[rd] = '\0';

					/* XXX: This is fairly inflexible. */
					contents2 = contents;

					if (!handle) {
						g_free(filename);
						continue;
					}

					rd = fread(contents, 1, 13, handle);
					fclose(handle);
					contents[rd] = '\0';

					contents2 = contents;
					while (*contents2 && *contents2 != '(')

	read = g_malloc(data->length + 2);

	file = g_fopen(data->path, "rb");
	fseek(file, data->offset, SEEK_SET);
	data->length = fread(read, 1, data->length, file);
	fclose(file);

	if (read[data->length-1] == '\n') {
		read[data->length] = '\0';
	} else {

	g_return_val_if_fail(file != NULL, g_strdup(""));

	contents = g_malloc(data->length + 2);

	fseek(file, data->offset, SEEK_SET);
	data->length = fread(contents, 1, data->length, file);
	fclose(file);

	contents[data->length] = '\n';
	contents[data->length + 1] = '\0';

	file = g_fopen(data->path, "rb");
	g_return_val_if_fail(file != NULL, g_strdup(""));
	
	fseek(file, data->offset, SEEK_SET);
	data->length = fread(contents, 1, data->length, file);
	fclose(file);

	contents[data->length] = '\n';
	contents[data->length + 1] = '\0';