rpms/oggvideotools/F-9 oggSlideshow-0.7a-noargs.patch, NONE, 1.1 oggStream-0.7a-bigPackets.patch, NONE, 1.1 import.log, 1.1, 1.2 oggvideotools.spec, 1.4, 1.5 oggSlideshow-noargs.patch, 1.1, NONE
Adam Miller
maxamillion at fedoraproject.org
Mon May 18 19:22:08 UTC 2009
- Previous message: rpms/sugar-calculator/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sugar-calculator.spec, 1.4, 1.5
- Next message: rpms/sugar-calculator/F-11 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sugar-calculator.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: maxamillion
Update of /cvs/extras/rpms/oggvideotools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4646/F-9
Modified Files:
import.log oggvideotools.spec
Added Files:
oggSlideshow-0.7a-noargs.patch oggStream-0.7a-bigPackets.patch
Removed Files:
oggSlideshow-noargs.patch
Log Message:
Patch from upstream applied for segfault in oggStream due to big packets
oggSlideshow-0.7a-noargs.patch:
--- NEW FILE oggSlideshow-0.7a-noargs.patch ---
--- src/oggSlideshow.cpp 2009-03-22 08:38:36.000000000 -0500
+++ src/oggSlideshow_patched.cpp 2009-05-15 06:41:05.000000000 -0500
@@ -478,7 +478,7 @@
argv += optind;
if ((argc < 1)) {
- std::cerr << "usage: "<<argv[0]<<" <pic.bmp> ... \n";
+ printHelpScreen(programName);
return (-1);
}
oggStream-0.7a-bigPackets.patch:
--- NEW FILE oggStream-0.7a-bigPackets.patch ---
Index: src/oggStreamEncoder.cpp
===================================================================
--- src/oggStreamEncoder.cpp (revision 22)
+++ src/oggStreamEncoder.cpp (revision 25)
@@ -100,8 +100,11 @@
dataLength += packet.length();
uint32 actSegmentsSize = (packet.length()+255)/255;
- uint8 actSegments[255];
+ uint8 actSegments[maxSegmentEntries];
+ if (actSegmentsSize > maxSegmentEntries)
+ throw "OggStreamEncoder::addPacket: Not able to handle this packet size";
+
/* calculate the segment table part of this packet */
memset(actSegments, 0xff, actSegmentsSize-1);
actSegments[actSegmentsSize-1] = packet.length()%255;
Index: src/oggStreamEncoder.h
===================================================================
--- src/oggStreamEncoder.h (revision 22)
+++ src/oggStreamEncoder.h (revision 25)
@@ -1,7 +1,7 @@
/*
* oggStreamEncoder is a class to insert an ogg packet into an ogg page stream
*
- * Copyright (C) 2008 Joern Seger
+ * Copyright (C) 2008-2009 Joern Seger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,6 +34,8 @@
class OggStreamEncoder : public MediaEncoder
{
protected:
+ static const uint32 maxSegmentEntries = 1024;
+
static std::vector<uint32> usedSerialNo;
uint32 maxPageSize;
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 15 May 2009 17:24:42 -0000 1.1
+++ import.log 18 May 2009 19:21:37 -0000 1.2
@@ -1 +1,2 @@
oggvideotools-0_7a-3_fc10:F-9:oggvideotools-0.7a-3.fc10.src.rpm:1242408215
+oggvideotools-0_7a-4_fc10:F-9:oggvideotools-0.7a-4.fc10.src.rpm:1242674351
Index: oggvideotools.spec
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/F-9/oggvideotools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- oggvideotools.spec 15 May 2009 17:24:42 -0000 1.4
+++ oggvideotools.spec 18 May 2009 19:21:38 -0000 1.5
@@ -1,6 +1,6 @@
Name: oggvideotools
Version: 0.7a
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Toolbox for manipulating Ogg video files
Group: Applications/Multimedia
@@ -12,7 +12,8 @@ BuildRequires: pkgconfig
BuildRequires: libogg-devel libvorbis-devel libtheora-devel SDL-devel
BuildRequires: gd-devel
-Patch0: oggSlideshow-noargs.patch
+Patch0: oggSlideshow-0.7a-noargs.patch
+Patch1: oggStream-0.7a-bigPackets.patch
%description
A toolbox for manipulating Ogg video files, which usually consist of a
@@ -23,6 +24,7 @@ such as for splitting the different stre
%prep
%setup -q
%patch0
+%patch1
%build
%configure
@@ -45,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%changelog
+* Mon May 18 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.7a-4
+- Patch from upstream applied for segfault in oggStream due to big packets
+
* Fri May 15 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.7a-3
- Patched a bug in oggSlideshow no showing help menu if no args passed
--- oggSlideshow-noargs.patch DELETED ---
- Previous message: rpms/sugar-calculator/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sugar-calculator.spec, 1.4, 1.5
- Next message: rpms/sugar-calculator/F-11 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sugar-calculator.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list