This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit a5861d0ec116fca143bb9f9c43923b89fa9d8eb1 Author: Sven Eckelmann <[email protected]> Date: Thu May 6 10:30:24 2010 +0200 Don't crash on long OpenGL vendor string in rice --- debian/changelog | 2 ++ debian/patches/rice-crash-vendorstring.patch | 30 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) diff --git a/debian/changelog b/debian/changelog index e7b107c..6a6fddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ mupen64plus (1.5+dfsg1-10) UNRELEASED; urgency=low starting again - Add rsp_hle_bigendian.patch, Fix wrong high level emulation of rsp on big endian systems + - Add rice-crash-vendorstring.patch, Don't crash on long OpenGL vendor + string -- Sven Eckelmann <[email protected]> Mon, 26 Apr 2010 23:06:55 +0200 diff --git a/debian/patches/rice-crash-vendorstring.patch b/debian/patches/rice-crash-vendorstring.patch new file mode 100644 index 0000000..e9bcbc4 --- /dev/null +++ b/debian/patches/rice-crash-vendorstring.patch @@ -0,0 +1,30 @@ +Description: Don't crash on long OpenGL vendor string +Origin: backport, http://bitbucket.org/richard42/mupen64plus-video-rice/changeset/382f8fe748f3 + +--- +diff --git a/rice_video/GraphicsContext.h b/rice_video/GraphicsContext.h +index 68ec3f0ca8a7b76f3b9599c6b26c04e5fa1301b4..37f60c868769812f9853e4351893cc8a34d7a2a3 100644 +--- a/rice_video/GraphicsContext.h ++++ b/rice_video/GraphicsContext.h +@@ -88,7 +88,7 @@ protected: + bool m_bWindowed; + RECT m_rcWindowBounds; + +- char m_strDeviceStats[90]; ++ char m_strDeviceStats[256]; + + virtual ~CGraphicsContext(); + CGraphicsContext(); +diff --git a/rice_video/OGLGraphicsContext.cpp b/rice_video/OGLGraphicsContext.cpp +index b7ea97bc0009153705a6b9bab6c9017a52ee4f98..617723eecae48f935e0f50b6f41ffbfe196d6dcf 100644 +--- a/rice_video/OGLGraphicsContext.cpp ++++ b/rice_video/OGLGraphicsContext.cpp +@@ -128,7 +128,7 @@ bool COGLGraphicsContext::Initialize(HWND hWnd, HWND hWndStatus, uint32 dwWidth, + + InitState(); + InitOGLExtension(); +- sprintf(m_strDeviceStats, "%s - %s : %s", m_pVendorStr, m_pRenderStr, m_pVersionStr); ++ sprintf(m_strDeviceStats, "%.60s - %.128s : %.60s", m_pVendorStr, m_pRenderStr, m_pVersionStr); + TRACE0(m_strDeviceStats); + printf("%s\n", m_strDeviceStats); + diff --git a/debian/patches/series b/debian/patches/series index 687f8d1..206c045 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,3 +39,4 @@ ftbfs-gvariant-type-conflicts.path dont-install-unneeded.patch rsp_ucode2_reset.patch rsp_hle_bigendian.patch +rice-crash-vendorstring.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
