Use BOOL return for code injection handler

greenflute · Oct 19, 2022 · ff16c42 · ff16c42
1 parent 849ac44
commit ff16c42
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Bit Slicer/ZGCodeInjectionWindowController.m b/Bit Slicer/ZGCodeInjectionWindowController.m
@@ -176,8 +176,7 @@ - (IBAction)injectCode:(id)__unused sender
 	NSError *error = nil;
 	NSData *injectedCode = [ZGDebuggerUtilities assembleInstructionText:ZGUnwrapNullableObject(_suggestedCode) atInstructionPointer:_allocatedAddress processType:_processType error:&error];
 
-	ZGCodeInjectionHandler *injectionHandler = nil;
-	if (injectedCode.length == 0 || error != nil || (injectionHandler = [ZGDebuggerUtilities injectCode:injectedCode intoAddress:_allocatedAddress hookingIntoOriginalInstructions:_instructions process:ZGUnwrapNullableObject(_process) processType:_processType breakPointController:_breakPointController owner:_owner undoManager:ZGUnwrapNullableObject(_undoManager) error:&error]) == nil)
+	if (injectedCode.length == 0 || error != nil || ![ZGDebuggerUtilities injectCode:injectedCode intoAddress:_allocatedAddress hookingIntoOriginalInstructions:_instructions process:ZGUnwrapNullableObject(_process) processType:_processType breakPointController:_breakPointController owner:_owner undoManager:ZGUnwrapNullableObject(_undoManager) error:&error])
 	{
 		NSLog(@"Error while injecting code");
 		NSLog(@"%@", error);

diff --git a/Bit Slicer/ZGDebuggerUtilities.h b/Bit Slicer/ZGDebuggerUtilities.h
@@ -90,7 +90,7 @@ actionName:(nullable NSString *)actionName;
 
 + (NSArray<ZGInstruction *> * _Nullable)instructionsBeforeHookingIntoAddress:(ZGMemoryAddress)address injectingIntoDestination:(ZGMemoryAddress)destinationAddress inProcess:(ZGProcess *)process breakPointController:(ZGBreakPointController *)breakPointController processType:(ZGProcessType)processType;
 
-+ (ZGCodeInjectionHandler * _Nullable)
++ (BOOL)
 injectCode:(NSData *)codeData
 intoAddress:(ZGMemoryAddress)allocatedAddress
 hookingIntoOriginalInstructions:(NSArray<ZGInstruction *> *)hookedInstructions

diff --git a/Bit Slicer/ZGDebuggerUtilities.m b/Bit Slicer/ZGDebuggerUtilities.m
@@ -487,7 +487,7 @@ + (BOOL)shouldInjectCodeWithRelativeBranchingWithProcess:(ZGProcess *)process pr
 }
 
 #define INJECT_ERROR_DOMAIN @"INJECT_CODE_FAILED"
-+ (ZGCodeInjectionHandler * _Nullable)
++ (BOOL)
 injectCode:(NSData *)codeData
 intoAddress:(ZGMemoryAddress)allocatedAddress
 hookingIntoOriginalInstructions:(NSArray<ZGInstruction *> *)hookedInstructions
@@ -502,7 +502,7 @@ + (BOOL)shouldInjectCodeWithRelativeBranchingWithProcess:(ZGProcess *)process pr
 
 	if (hookedInstructions == nil)
 	{
-		return nil;
+		return NO;
 	}
 
 	ZGSuspendTask(process.processTask);
@@ -531,7 +531,7 @@ + (BOOL)shouldInjectCodeWithRelativeBranchingWithProcess:(ZGProcess *)process pr
 
 		free(nopBuffer);
 		ZGResumeTask(process.processTask);
-		return nil;
+		return NO;
 	}
 
 	free(nopBuffer);
@@ -545,7 +545,7 @@ + (BOOL)shouldInjectCodeWithRelativeBranchingWithProcess:(ZGProcess *)process pr
 		}
 
 		ZGResumeTask(process.processTask);
-		return nil;
+		return NO;
 	}
 
 	ZGMemorySize hookedInstructionsLength = 0;
@@ -606,7 +606,7 @@ + (BOOL)shouldInjectCodeWithRelativeBranchingWithProcess:(ZGProcess *)process pr
 		{
 			ZG_LOG(@"Error generating nop data for jumpFromIslandData");
 			ZGResumeTask(process.processTask);
-			return nil;
+			return NO;
 		}
 
 		[newInstructionsData appendData:jumpFromIslandData];
@@ -682,7 +682,7 @@ + (BOOL)shouldInjectCodeWithRelativeBranchingWithProcess:(ZGProcess *)process pr
 		{
 			ZG_LOG(@"Error generating jumpFromIslandData");
 			ZGResumeTask(process.processTask);
-			return nil;
+			return NO;
 		}
 
 		[newInstructionsData appendData:jumpFromIslandData];
@@ -704,13 +704,13 @@ + (BOOL)shouldInjectCodeWithRelativeBranchingWithProcess:(ZGProcess *)process pr
 		if (![codeInjectionHandler addBreakPointWithToIslandInstruction:firstInstruction fromIslandInstruction:instructionBack islandAddress:allocatedAddress process:process processType:processType breakPointController:breakPointController owner:owner undoManager:undoManager])
 		{
 			ZG_LOG(@"Error: Failed to add breakpoints for code injection..");
-			return nil;
+			return NO;
 		}
 	}
 
 	ZGResumeTask(process.processTask);
 
-	return codeInjectionHandler;
+	return YES;
 }
 
 + (NSArray<ZGInstruction *> *)instructionsBeforeHookingIntoAddress:(ZGMemoryAddress)address injectingIntoDestination:(ZGMemoryAddress)destinationAddress inProcess:(ZGProcess *)process breakPointController:(ZGBreakPointController *)breakPointController processType:(ZGProcessType)processType

diff --git a/Bit Slicer/ZGPyDebugger.m b/Bit Slicer/ZGPyDebugger.m
@@ -826,7 +826,7 @@ static ZGProcessType _processTypeFromDisassemblerMode(DebuggerClass *self, char
 
 		NSError *error = nil;
 		BOOL injectedCode =
-		([ZGDebuggerUtilities
+		[ZGDebuggerUtilities
 		 injectCode:codeData
 		 intoAddress:destinationAddress
 		 hookingIntoOriginalInstructions:originalInstructions
@@ -835,7 +835,7 @@ static ZGProcessType _processTypeFromDisassemblerMode(DebuggerClass *self, char
 		 breakPointController:self->objcSelf->_breakPointController
 		 owner:self->breakPointDelegate
 		 undoManager:nil
-		 error:&error] != nil);
+		 error:&error];
 
 		if (!injectedCode)
 		{