rpms/emma/F-10 emma-2.0.5312-64_bit_fix.patch, NONE, 1.1 emma.spec, 1.3, 1.4
Andrew Overholt
overholt at fedoraproject.org
Wed Dec 10 15:20:03 UTC 2008
Author: overholt
Update of /cvs/pkgs/rpms/emma/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6762
Modified Files:
emma.spec
Added Files:
emma-2.0.5312-64_bit_fix.patch
Log Message:
* Wed Dec 10 2008 Andrew Overholt <overholt at redhat.com> 0:2.0.5312-2
- Add patch to fix 64-bit AIOOB.
emma-2.0.5312-64_bit_fix.patch:
--- NEW FILE emma-2.0.5312-64_bit_fix.patch ---
diff -up ./core/java12/com/vladium/emma/instr/InstrVisitor.java.64bitfix ./core/java12/com/vladium/emma/instr/InstrVisitor.java
--- ./core/java12/com/vladium/emma/instr/InstrVisitor.java.64bitfix 2004-07-16 18:32:28.000000000 -0400
+++ ./core/java12/com/vladium/emma/instr/InstrVisitor.java 2008-12-10 09:37:04.000000000 -0500
@@ -1435,6 +1435,7 @@ final class InstrVisitor extends Abstrac
*/
void emit (final EmitCtx ctx, final byte [] code) // TODO: move 'code' into 'ctx'
{
+ synchronized(Block.class) {
final ByteArrayOStream out = ctx.m_out;
final int first = m_first;
@@ -1450,6 +1451,7 @@ final class InstrVisitor extends Abstrac
if (m_branch != null)
m_branch.emit (ctx);
+ }
}
public CodeSegment m_insertion;
@@ -2206,4 +2208,4 @@ final class InstrVisitor extends Abstrac
private static final byte [] EMPTY_BYTE_ARRAY = new byte [0];
} // end of class
-// ----------------------------------------------------------------------------
\ No newline at end of file
+// ----------------------------------------------------------------------------
Index: emma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emma/F-10/emma.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emma.spec 9 Jul 2008 18:32:48 -0000 1.3
+++ emma.spec 10 Dec 2008 15:19:27 -0000 1.4
@@ -33,7 +33,7 @@
Summary: Code Coverage Tool
Name: emma
Version: %{shortver}.5312
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Group: Development/Tools
License: CPL
@@ -55,6 +55,10 @@
# This is a hack until we get the source for the timestamping class
# http://sourceforge.net/tracker/index.php?func=detail&aid=1953619&group_id=108932&atid=651900
Patch4: %{name}-timestamp.patch
+# This patch fixes ArrayIndexOutOfBoundExceptions on 64-bit. I modified
+# the patch against HEAD to apply to this version -- overholt
+# http://sourceforge.net/tracker/index.php?func=detail&aid=2119913&group_id=108932&atid=651897
+Patch5: %{name}-%{version}-64_bit_fix.patch
Requires: java >= 0:1.4.2
Requires: jaxp_parser_impl
BuildRequires: ant >= 0:1.6.5
@@ -95,6 +99,7 @@
%patch2 -p1 -b .orig
%patch3 -b .orig
%patch4 -b .orig
+%patch5 -b .orig
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
@@ -144,6 +149,9 @@
%doc %{_javadocdir}/%{name}*
%changelog
+* Wed Dec 10 2008 Andrew Overholt <overholt at redhat.com> 0:2.0.5312-2
+- Add patch to fix 64-bit AIOOB.
+
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.5312-1
- drop repotag
- fix version, release to be sane
More information about the fedora-extras-commits
mailing list