New branch 'server-1.15-branch' available with the following commits: commit 5e0432f797d58fe1a69ef538694f65bbba38737f Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Wed Jan 1 11:10:41 2014 -0800 XQuartz: Avoid passing uninitialized pointers to X11ApplicationSetWindowMenu in AppleWMSetWindowMenu Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit 77df653ae3d8448be21221711851acde12c6bc1a) commit 859ced56d9ee168796c2fcf7fa6056e0c1491f3a Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Wed Jan 1 11:04:07 2014 -0800 XQuartz: Check for allocated memory before using it in AppleWMSetWindowMenu Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit 3bc608a361a01043b226fb9aaebf88f6fd852925) commit 9444955d16f85926c75ee8eafb0ca796dcf16439 Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Wed Jan 1 11:00:40 2014 -0800 XQuartz: Silence a clang static analysis warning about a memory leak It seems the alanyzer can't comprehend dixSetPrivate(). quartz.c:119:12: warning: Potential leak of memory pointed to by 'displayInfo' return quartzProcs->AddScreen(index, pScreen); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit 64327226ddfba8f0653615cd678d2d4336fb993d) commit 64b0669d1c062e7e11fb0e3b8ea7fe56113fc86f Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Wed Jan 1 10:55:10 2014 -0800 XQuartz: Silence a clang static analysis warning about a possible memory leak on exit stub.c:356:9: warning: Potential leak of memory pointed to by 'newargv' asl_log(aslc, NULL, ASL_LEVEL_ERR, ^~~~~~~ stub.c:356:9: warning: Potential leak of memory pointed to by 'newenvp' asl_log(aslc, NULL, ASL_LEVEL_ERR, ^~~~~~~ 2 warnings generated. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit b2f6b3497c33a4897afae80a2cf69c596b9f81e8) commit 472e8e5d1c26573cef4bd42451230ef47791ed6f Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Wed Jan 1 10:47:52 2014 -0800 XQuartz: Validate length in appledri before swapping Avoids potential memory corruption from bad requests Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit a03f096a85537d9e881cedaa6cb71aca43a97086) commit 782fe5c174def75a9e4cb188c00c2fec72821472 Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Wed Jan 1 10:39:56 2014 -0800 XQuartz: Validate screen in AppleDRIQueryDirectRenderingCapable requests Return an error to the caller rather than crashing the server on invalid screens. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit b3572c0d1ab7888ac26d6b2b8be6d1d19ed9af3f) commit 045122566c0532378b50c1af3ffec3254e416fe2 Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Sun Dec 29 12:45:23 2013 -0800 XQuartz: Simplify hook_run to quiet static analyzer x-hook.c:96:9: warning: Called function pointer is an uninitalized pointer value (*fun[i])(arg, data[i]); ^~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit 959e8f23af7850fcaf40d6c67f5228241a36a9ab) commit 33b2ae0f3b4a80fd962d876f7437d98fcfc27791 Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Sun Dec 29 12:41:18 2013 -0800 XQuartz: Mark applicationWillTerminate: noreturn X11Controller.m:938:1: warning: method 'applicationWillTerminate:' could be declared with attribute 'noreturn' [-Wmissing-noreturn,Semantic Issue] { ^ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit f79af1941776fd6f1ec26c50603fcc35ca7d514b) commit 404f26866147be1c26585e59d9795e87e0c3e5fa Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Sun Dec 29 12:36:51 2013 -0800 XQuartz: Fix get_proc_address signature indirect.c:675:28: warning: incompatible pointer types passing 'glx_gpa_proc (*)(const char *)' to parameter of type 'glx_gpa_proc' (aka 'glx_func_ptr (*)(const char *)') [-Wincompatible-pointer-types,Semantic Issue] __glXsetGetProcAddress(&get_proc_address); ^~~~~~~~~~~~~~~~~ ../../../glx/glxserver.h:122:42: note: passing argument to parameter 'get_proc_address' here [Semantic Issue] void __glXsetGetProcAddress(glx_gpa_proc get_proc_address); ^ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit ea80279e292e59a9fe9651489f03e9f2f39810d9) commit 7803c4075b824ece79af0425cee736025c41d901 Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Sun Dec 29 12:31:23 2013 -0800 XQuartz: Fix darwinfb.h header guard ./darwinfb.h:28:9: warning: '_DARWIN_FB_H' is used as a header guard here, followed by #define of a different macro [-Wheader-guard,Lexical or Preprocessor Issue] ^~~~~~~~~~~~ ./darwinfb.h:29:9: note: '_DARWIN_DB_H' is defined here; did you mean '_DARWIN_FB_H'? [Lexical or Preprocessor Issue] ^~~~~~~~~~~~ _DARWIN_FB_H Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit 2e3ebec9520719a8e5c3c92390e83bcb5216f978) commit 6c055f0d78349ff08a570c5dcc92c6f7b6924993 Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Sun Dec 29 12:22:55 2013 -0800 XQuartz: Silence some static analyzer warnings by annotating referencing counts Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> (cherry picked from commit 9da6c0918f40359f28fe8889d5b7cae7efcc8377)