diff -u mupen64plus-1.5+dfsg1/debian/changelog mupen64plus-1.5+dfsg1/debian/changelog --- mupen64plus-1.5+dfsg1/debian/changelog +++ mupen64plus-1.5+dfsg1/debian/changelog @@ -1,3 +1,11 @@ +mupen64plus (1.5+dfsg1-7ubuntu1) lucid; urgency=low + + * debian/patches: + - Add rice-crash-vendorstring.patch, Don't crash on long OpenGL vendor + string (Closes: #580480, LP: #575968) + + -- Sven Eckelmann Thu, 06 May 2010 11:34:46 +0200 + mupen64plus (1.5+dfsg1-7build1) lucid; urgency=low * No change rebuild for liblzma (xz-utils) transition diff -u mupen64plus-1.5+dfsg1/debian/patches/series mupen64plus-1.5+dfsg1/debian/patches/series --- mupen64plus-1.5+dfsg1/debian/patches/series +++ mupen64plus-1.5+dfsg1/debian/patches/series @@ -36,0 +37 @@ +rice-crash-vendorstring.patch only in patch2: unchanged: --- mupen64plus-1.5+dfsg1.orig/debian/patches/rice-crash-vendorstring.patch +++ mupen64plus-1.5+dfsg1/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); +