[libunicap/f12/master] fix a crasher bug (#647880)
Kamil Dudka
kdudka at fedoraproject.org
Tue Nov 2 15:57:24 UTC 2010
commit ba49a19c9654bdf58c9612b550534b7a10224dae
Author: Kamil Dudka <kdudka at redhat.com>
Date: Tue Nov 2 16:32:40 2010 +0100
fix a crasher bug (#647880)
... introduced by libunicap-0.9.12-memerrs.patch
libunicap-0.9.12-memerrs.patch | 11 -----------
libunicap.spec | 5 ++++-
2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/libunicap-0.9.12-memerrs.patch b/libunicap-0.9.12-memerrs.patch
index 44d6993..83e91ce 100644
--- a/libunicap-0.9.12-memerrs.patch
+++ b/libunicap-0.9.12-memerrs.patch
@@ -64,17 +64,6 @@ index ba3d5b3..925659c 100644
{
handle->unicap_formats[v4l2_fmt.index].min_size.width =
handle->unicap_formats[v4l2_fmt.index].min_size.height = 1;
-@@ -927,7 +927,9 @@ static unicap_status_t v4l2_reenumerate_formats( void *cpi_data, int *_pcount )
- handle->unicap_formats[v4l2_fmt.index].size_count = size_count;
- handle->unicap_formats[v4l2_fmt.index].buffer_size =
- ( sizes[size_count-1].width * sizes[size_count-1].height * handle->unicap_formats[v4l2_fmt.index].bpp / 8 );
-- }
-+
-+ free( sizes );
-+ }
-
- v4l2_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- }
@@ -2148,6 +2150,8 @@ static unicap_status_t v4l2_queue_buffer( void *cpi_data, unicap_data_buffer_t *
else
{
diff --git a/libunicap.spec b/libunicap.spec
index 90a9c8e..fd8a870 100644
--- a/libunicap.spec
+++ b/libunicap.spec
@@ -7,7 +7,7 @@
Summary: Library to access different kinds of (video) capture devices
Name: libunicap
Version: 0.9.12
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.unicap-imaging.org/
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/%{name}
%changelog
+* Tue Nov 02 2010 Kamil Dudka <kdudka at redhat.com> 0.9.12-6
+- fix a crasher bug introduced by libunicap-0.9.12-memerrs.patch (#647880)
+
* Fri Oct 29 2010 Robert Scheck <robert at fedoraproject.org> 0.9.12-5
- Use ATTRS rather SYSFS for udev where appropriate (#643729)
More information about the scm-commits
mailing list