[graphite2] 35/69: Imported Debian patch 1.2.2-1+alpha
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository graphite2.
commit 74b7c522e92b40f33fb87db70d608fd396aef367
Author: Michael Cree <mcree@orcon.net.nz>
Date: Sun Jun 2 11:50:07 2013 +1200
Imported Debian patch 1.2.2-1+alpha
---
debian/changelog | 6 ++++++
debian/patches/fix-misaligned-memory-access.patch | 12 ++++++++++++
debian/patches/series | 1 +
3 files changed, 19 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ec3865c..cbbb846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+graphite2 (1.2.2-1+alpha) unreleased; urgency=low
+
+ * Fix unaligned memory access and FTBFS on alpha (#710336)
+
+ -- Michael Cree <mcree@orcon.net.nz> Sun, 02 Jun 2013 11:50:07 +1200
+
graphite2 (1.2.2-1) unstable; urgency=low
* New upstream release
diff --git a/debian/patches/fix-misaligned-memory-access.patch b/debian/patches/fix-misaligned-memory-access.patch
new file mode 100644
index 0000000..1a3dc54
--- /dev/null
+++ b/debian/patches/fix-misaligned-memory-access.patch
@@ -0,0 +1,12 @@
+--- graphite2-1.2.1-orig/src/Pass.cpp 2013-02-28 08:32:04.000000000 +1300
++++ graphite2-1.2.1/src/Pass.cpp 2013-06-02 11:26:52.004522217 +1200
+@@ -195,7 +195,8 @@ bool Pass::readRules(const byte * rule_m
+ if (r->sort > 63 || r->preContext >= r->sort || r->preContext > m_maxPreCtxt || r->preContext < m_minPreCtxt)
+ return false;
+ ac_begin = ac_data + be::peek<uint16>(--o_action);
+- rc_begin = *--o_constraint ? rc_data + be::peek<uint16>(o_constraint) : rc_end;
++ --o_constraint;
++ rc_begin = be::peek<uint16>(o_constraint) ? rc_data + be::peek<uint16>(o_constraint) : rc_end;
+
+ if (ac_begin > ac_end || ac_begin > ac_data_end || ac_end > ac_data_end
+ || rc_begin > rc_end || rc_begin > rc_data_end || rc_end > rc_data_end)
diff --git a/debian/patches/series b/debian/patches/series
index 1931d2b..c949971 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ include-and-libraries.diff
no-specific-nunit-version.diff
soname.diff
foo
+fix-misaligned-memory-access.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
Reply to: