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

Merge remote-tracking branch

Browse Source 
'origin/GP-4761_ghidragon_fixing_small_bug_in_goto' into Ghidra_11.2
(Closes #6699)
This commit is contained in:
Ryan Kurtz 2024-09-13 13:47:18 -04:00
commit e5aa0e8e5b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.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.
@ -510,7 +510,7 @@ public class GoToQuery {
int colonIndex = scopeName.lastIndexOf("::"); int colonIndex = scopeName.lastIndexOf("::");
if (colonIndex >= 0) { if (colonIndex >= 0) {
String parentScopeName = scopeName.substring(0, colonIndex); String parentScopeName = scopeName.substring(0, colonIndex);
scopeName = scopeName.substring(colonIndex + 1); scopeName = scopeName.substring(colonIndex + 2);
parent = getScope(program, parent, parentScopeName); parent = getScope(program, parent, parentScopeName);
if (parent == null) { if (parent == null) {
return null; return null;