Attachment 309552 Details for Bug 451727 – Patch fixing the problems.

[patch] Patch fixing the problems.

libraw1394-1.3.0-valgrind-fixes.patch (text/plain), 3.00 KB, created by Philippe Troin on 2008-06-16 23:57:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Troin

Created: 2008-06-16 23:57:43 UTC

Size: 3.00 KB

patch

obsolete

>diff -ru libraw1394-1.3.0.orig/juju/raw1394-iso.c libraw1394-1.3.0/juju/raw1394-iso.c
>--- libraw1394-1.3.0.orig/juju/raw1394-iso.c	2008-06-13 13:16:05.000000000 -0700
>+++ libraw1394-1.3.0/juju/raw1394-iso.c	2008-06-13 12:59:11.000000000 -0700
>@@ -395,6 +395,7 @@
> 	}
> 
> 	handle->iso.closure.func = handle_iso_event;
>+	memset(&ep, 0, sizeof(ep));
> 	ep.events = EPOLLIN;
> 	ep.data.ptr = &handle->iso.closure;
> 	if (epoll_ctl(handle->epoll_fd, EPOLL_CTL_ADD,
>@@ -405,6 +406,7 @@
> 		return -1;
> 	}
> 
>+	memset(&create, 0, sizeof(create));
> 	create.type = type;
> 	create.channel = channel;
> 	create.speed = speed;
>diff -ru libraw1394-1.3.0.orig/juju/raw1394.c libraw1394-1.3.0/juju/raw1394.c
>--- libraw1394-1.3.0.orig/juju/raw1394.c	2008-06-13 13:16:05.000000000 -0700
>+++ libraw1394-1.3.0/juju/raw1394.c	2008-06-13 12:41:55.000000000 -0700
>@@ -154,6 +154,8 @@
> 		fd = open(filename, O_RDWR);
> 		if (fd < 0)
> 			continue;
>+		memset(&get_info, 0, sizeof(get_info));
>+		memset(&reset, 0, sizeof(reset));
> 		get_info.version = FW_CDEV_VERSION;
> 		get_info.rom = 0;
> 		get_info.rom_length = 0;
>@@ -407,7 +409,10 @@
> 	struct epoll_event ep;
> 	int i;
> 
>+	memset(&ep, 0, sizeof(ep));
>+
> 	handle = malloc(sizeof *handle);
>+	memset(handle, 0, sizeof(*handle));
> 
> 	handle->tag_handler = default_tag_handler;
> 	handle->arm_tag_handler = default_arm_tag_handler;
>@@ -593,6 +598,8 @@
> 		if (fd < 0)
> 			continue;
> 
>+		memset(&get_info, 0, sizeof(get_info));
>+		memset(&reset, 0, sizeof(reset));
> 		get_info.version = FW_CDEV_VERSION;
> 		get_info.rom = 0;
> 		get_info.rom_length = 0;
>@@ -616,10 +623,12 @@
> 			sizeof handle->devices[i].filename);
> 
> 		handle->devices[i].closure.func = handle_device_event;
>+		memset(&ep, 0, sizeof(ep));
> 		ep.events = EPOLLIN;
> 		ep.data.ptr = &handle->devices[i].closure;
> 		if (epoll_ctl(handle->epoll_fd, EPOLL_CTL_ADD, fd, &ep) < 0) {
> 			close(fd);
>+			closedir(dir);
> 			return -1;
> 		}
> 
>@@ -634,6 +643,7 @@
> 		i++;
> 	}
> 
>+	closedir(dir);
> 	return 0;
> }
> 
>@@ -1286,6 +1296,7 @@
> 
> 	closure->callback = handle_fcp_request;
> 
>+	memset(&request, 0, sizeof(request));
> 	request.offset = CSR_REGISTER_BASE + CSR_FCP_COMMAND;
> 	request.length = CSR_FCP_END - CSR_FCP_COMMAND;
> 	request.closure = ptr_to_u64(closure);
>@@ -1328,6 +1339,7 @@
> 	struct fw_cdev_get_info get_info;
> 	int err;
> 
>+	memset(&get_info, 0, sizeof(get_info));
> 	get_info.version = FW_CDEV_VERSION;
> 	get_info.rom = ptr_to_u64(buffer);
> 	get_info.rom_length = buffersize;
>diff -ru libraw1394-1.3.0.orig/tools/testlibraw.c libraw1394-1.3.0/tools/testlibraw.c
>--- libraw1394-1.3.0.orig/tools/testlibraw.c	2008-06-13 13:16:05.000000000 -0700
>+++ libraw1394-1.3.0/tools/testlibraw.c	2008-06-13 12:24:54.000000000 -0700
>@@ -202,6 +202,7 @@
> 	read_topology_map(handle);
> 
>         printf("testing config rom stuff\n");
>+	memset(rom, 0, sizeof(rom));
>         retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
>         printf("get_config_rom returned %d, romsize %d, rom_version %d\n",retval,rom_size,rom_version);
>         printf("here are the first 10 quadlets:\n");

Actions: View | Diff

Attachments on bug 451727: 309552