Skip to content

Commit e07b8b9

Browse files
author
董宏昌
committed
fix pblock error
1 parent e3f84a6 commit e07b8b9

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

commands/FBClassDump.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ def getBlockVariables(self, block, min_var_count=1, max_var_count=20):
198198
NSMutableDictionary *dict = (id)[NSMutableDictionary dictionary];
199199
200200
// Get the list of classes and look for testPointerClass
201-
NSInteger numClasses = objc_getClassList(NULL, 0);
201+
NSInteger numClasses = (NSInteger)objc_getClassList(NULL, 0);
202202
Class *classesList = (Class*)malloc(sizeof(Class) * numClasses);
203-
numClasses = objc_getClassList(classesList, numClasses);
203+
numClasses = (NSInteger)objc_getClassList(classesList, numClasses);
204204
205205
Class **blockVariables = real.variables;
206206
for (int i = 0; i < BLOCK_VARIABLES_COUNT; i++) {
@@ -219,9 +219,12 @@ def getBlockVariables(self, block, min_var_count=1, max_var_count=20):
219219
break;
220220
}
221221
}
222+
// __Block_byref_xxx may break this
223+
/*
222224
if (!isClass) {
223-
break;
225+
break;
224226
}
227+
*/
225228
226229
NSString *key = [NSString stringWithFormat:@"variables[%d]", i];
227230
NSString *value = [NSString stringWithFormat:@"%@", obj];

fblldbbase.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ def evaluateCStringExpression(expression, printErrors=True):
144144
RETURN_MACRO = """
145145
#define IS_JSON_OBJ(obj)\
146146
(obj != nil && ((bool)[NSJSONSerialization isValidJSONObject:obj] ||\
147-
(bool)[obj isKindOfClass:[NSString class]] ||\
148-
(bool)[obj isKindOfClass:[NSNumber class]]))
147+
(bool)[obj isKindOfClass:(Class)[NSString class]] ||\
148+
(bool)[obj isKindOfClass:(Class)[NSNumber class]]))
149149
#define RETURN(ret) ({\
150150
if (!IS_JSON_OBJ(ret)) {\
151151
(void)[NSException raise:@"Invalid RETURN argument" format:@""];\

0 commit comments

Comments
 (0)