[[ Bug 20425 ]] Fix internal extract for 64-bit Mach-O files

runrevmark · livecodepanos · commit 81dbba262de2 · 2017-09-25T10:13:26.000+01:00
This patch ensures that the section extraction code searches for the correct load command in 64-bit slices. (cherry picked from commit 951a48a)
diff --git a/engine/src/deploy_macosx.cpp b/engine/src/deploy_macosx.cpp
@@ -2747,7 +2747,7 @@ template<typename T> static bool MCDeployExtractArchCallbackBody(MCDeployExtract
 	t_section = nil;
 	for(uint32_t i = 0; i < t_header . ncmds; i++)
 	{
-		if (t_commands[i] -> cmd != LC_SEGMENT)
+        if (t_commands[i] -> cmd != T::seg_load_command)
 			continue;
 		
 		typename T::segment_command *t_segment;

Original file line number	Diff line number	Diff line change
`@@ -2747,7 +2747,7 @@ template<typename T> static bool MCDeployExtractArchCallbackBody(MCDeployExtract`
`2747`	`2747`	`t_section = nil;`
`2748`	`2748`	`for(uint32_t i = 0; i < t_header . ncmds; i++)`
`2749`	`2749`	`{`
`2750`		`- if (t_commands[i] -> cmd != LC_SEGMENT)`
	`2750`	`+ if (t_commands[i] -> cmd != T::seg_load_command)`
`2751`	`2751`	`continue;`
`2752`	`2752`
`2753`	`2753`	`typename T::segment_command *t_segment;`