diff options
author | marha <marha@users.sourceforge.net> | 2010-04-27 13:04:40 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-27 13:04:40 +0000 |
commit | 9691d196c34d551ebc33843692afd0ee23b9389b (patch) | |
tree | 184412bc028d5e4b62492d4c95a899b35e600692 /xorg-server/Xext/panoramiX.c | |
parent | f49a8c2a1f02f8089d709ec8dcf7080c041baf0c (diff) | |
download | vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.gz vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.bz2 vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.zip |
svn merge -r549:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/Xext/panoramiX.c')
-rw-r--r-- | xorg-server/Xext/panoramiX.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c index 96eb8f9e1..d5965c2d0 100644 --- a/xorg-server/Xext/panoramiX.c +++ b/xorg-server/Xext/panoramiX.c @@ -476,7 +476,8 @@ void PanoramiXExtensionInit(int argc, char *argv[]) panoramiXdataPtr = (PanoramiXData *) xcalloc(PanoramiXNumScreens, sizeof(PanoramiXData)); - BREAK_IF(!panoramiXdataPtr); + if (!panoramiXdataPtr) + break; if (!dixRequestPrivate(PanoramiXGCKey, sizeof(PanoramiXGCRec))) { noPanoramiXExtension = TRUE; |