GT-3190: Fixing Advanced Development Lab 5 Answer (closes NationalSec…

…urityAgency#1028).
revanthstrakz · Sep 26, 2019 · 2839527 · 2839527
1 parent 91e4fd7
commit 2839527
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/GhidraDocs/GhidraClass/AdvancedDevelopment/GhidraAdvancedDevelopment.html b/GhidraDocs/GhidraClass/AdvancedDevelopment/GhidraAdvancedDevelopment.html
@@ -910,8 +910,7 @@ <h2>Scripting Lab</h2>
 
     <annot>@Override</annot>
     <kw>public</kw> <kw>void</kw> run() <kw>throws</kw> Exception {
-        <if>Instruction</if> <loc>instruction</loc> = getFirstInstruction();
-        <kw>while</kw> (<loc>instruction</loc> != <kw>null</kw>) {
+        <kw>for</kw> (<if>Instruction</if> <loc>instruction</loc> = getFirstInstruction(); <loc>instruction</loc> != <kw>null</kw>; <loc>instruction</loc> = getNextInstruction()) {
             <kw>if</kw> ( <fld>monitor</fld>.isCancelled() ) {
                 <kw>break</kw>;
             }
@@ -933,7 +932,6 @@ <h2>Scripting Lab</h2>
             Scalar <loc>scalar</loc> = (Scalar) <loc>opObjects1</loc>[<lit>0</lit>];
             String <loc>comment</loc> = <strlit>"["</strlit> + <loc>register</loc>.getName() + <strlit>"]=["</strlit> + <loc>scalar</loc>.toString(<lit>16</lit>, <kw>false</kw>, <kw>false</kw>, <stlrit>""</strlit>, <strlit>""</strlit>) + <strlit>"]"</strlit>;
             setEOLComment(<loc>instruction</loc>.getMinAddress(), <loc>comment</loc>);
-            <loc>instruction</loc> = getNextInstruction();
         }
     }
 }</codeblock>

diff --git a/GhidraDocs/certification.manifest b/GhidraDocs/certification.manifest
@@ -16,7 +16,7 @@ GhidraClass/Advanced/GHIDRA_1.png||GHIDRA||||END|
 GhidraClass/Advanced/ghidraRight.png||GHIDRA||||END|
 GhidraClass/Advanced/improvingDisassemblyAndDecompilation.pdf||GHIDRA||||END|
 GhidraClass/Advanced/improvingDisassemblyAndDecompilation.tex||GHIDRA||||END|
-GhidraClass/AdvancedDevelopment/GhidraAdvancedDevelopment.html||GHIDRA||reviewed|This file contains mostly Ghidra content, but also includes code that is available for distribution, without restrictions, from https://github.com/paulrouget/dzslides.|END|
+GhidraClass/AdvancedDevelopment/GhidraAdvancedDevelopment.html||GHIDRA|||This file contains mostly Ghidra content, but also includes code that is available for distribution, without restrictions, from https://github.com/paulrouget/dzslides.|END|
 GhidraClass/AdvancedDevelopment/GhidraAdvancedDevelopment_withNotes.html||Public Domain|||Slight modification of code that is available for distribution, without restrictions, (original extremely permissive wtf license allows us to change IP to Public Domain),from https://github.com/paulrouget/dzslides.|END|
 GhidraClass/AdvancedDevelopment/Images/GhidraLogo64.png||GHIDRA||||END|
 GhidraClass/AdvancedDevelopment/Images/highLevelClasses.png||GHIDRA||||END|