Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 21:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-4898: Fixes for the SwiftDemangler

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-23 11:53:22 -04:00
parent fd1a448bf5
commit ce2f8b94cf
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Ghidra/Features/SwiftDemangler/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangler.java
View File

@ -106,15 +106,6 @@ public class SwiftDemangler implements Demangler {
return null; return null;
} }
@Override
public DemangledObject demangle(MangledContext context) throws DemangledException {
DemanglerOptions op = context.getOptions();
String mangled = context.getMangled();
DemangledObject demangledObject = demangle(mangled, op);
demangledObject.setMangledContext(context);
return demangledObject;
}
/** /**
* Get a new {@link Demangled} by demangling the given mangled string * Get a new {@link Demangled} by demangling the given mangled string
* *

10
Ghidra/Features/SwiftDemangler/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -702,4 +702,10 @@ public class SwiftDemanglerTest extends AbstractGenericTest {
} }
assertEquals(demangled, function.toString()); assertEquals(demangled, function.toString());
} }
@Test
public void testUnsupportedString() throws Exception {
String mangled = "__mh_execute_header";
assertNull(demangler.demangle(mangled));
}
} }