From 94be00a63d78511f9400dd8b40b7674ca6927c68 Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Thu, 11 Oct 2018 20:06:13 -0700 Subject: [PATCH] java-examples: fix reported minor vulnerabilities Signed-off-by: Mihai Tudor Panu --- examples/java/A110X_intr_Example.java | 9 ++++++--- examples/java/Button_intr_Example.java | 9 ++++++--- examples/java/FlexSensor_Example.java | 2 +- examples/java/GroveButton_intr_Example.java | 7 +++++-- examples/java/GroveQTouch_Example.java | 2 +- examples/java/RPR220_intr_Example.java | 7 +++++-- examples/java/WT5001_Example.java | 8 ++++---- 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/examples/java/A110X_intr_Example.java b/examples/java/A110X_intr_Example.java index ce722b89..6334d8e2 100644 --- a/examples/java/A110X_intr_Example.java +++ b/examples/java/A110X_intr_Example.java @@ -24,8 +24,11 @@ public class A110X_intr_Example { - public static int counter=0; - + private static int counter=0; + + public static void incrementCounter() { + counter++; + } public static void main(String[] args) throws InterruptedException { //! [Interesting] // Instantiate an A110X sensor on digital pin D2 @@ -52,6 +55,6 @@ class A110XISR implements Runnable { super(); } public void run(){ - A110X_intr_Example.counter++; + A110X_intr_Example.incrementCounter(); } } \ No newline at end of file diff --git a/examples/java/Button_intr_Example.java b/examples/java/Button_intr_Example.java index 9268d4c2..5c50f8dc 100644 --- a/examples/java/Button_intr_Example.java +++ b/examples/java/Button_intr_Example.java @@ -24,9 +24,12 @@ public class Button_intr_Example { - public static int counter = 0; + private static int counter = 0; - public static void main(String[] args) throws InterruptedException { + public static void incrementCounter() { + counter++; + } + public static void main(String[] args) throws InterruptedException { // ! [Interesting] upm_button.Button b = new upm_button.Button(2); @@ -47,7 +50,7 @@ class ButtonISR implements Runnable { } public void run() { - Button_intr_Example.counter++; + Button_intr_Example.incrementCounter(); System.out.println("Button pressed!"); } } diff --git a/examples/java/FlexSensor_Example.java b/examples/java/FlexSensor_Example.java index 46d8295e..060803ad 100644 --- a/examples/java/FlexSensor_Example.java +++ b/examples/java/FlexSensor_Example.java @@ -32,7 +32,7 @@ public class FlexSensor_Example { Thread.sleep(1000); } catch (InterruptedException e) { // TODO Auto-generated catch block - e.printStackTrace(); + System.out.println(e.toString()); } } //! [Interesting] diff --git a/examples/java/GroveButton_intr_Example.java b/examples/java/GroveButton_intr_Example.java index 4cf26b48..790400f9 100644 --- a/examples/java/GroveButton_intr_Example.java +++ b/examples/java/GroveButton_intr_Example.java @@ -24,8 +24,11 @@ public class GroveButton_intr_Example { - public static int counter = 0; + private static int counter = 0; + public static void incrementCounter() { + counter++; + } public static void main(String[] args) throws InterruptedException { // ! [Interesting] upm_grove.GroveButton b = new upm_grove.GroveButton(2); @@ -47,7 +50,7 @@ class ButtonISR implements Runnable { } public void run() { - GroveButton_intr_Example.counter++; + GroveButton_intr_Example.incrementCounter(); System.out.println("Button pressed!"); } } \ No newline at end of file diff --git a/examples/java/GroveQTouch_Example.java b/examples/java/GroveQTouch_Example.java index 9b83af64..26780a39 100644 --- a/examples/java/GroveQTouch_Example.java +++ b/examples/java/GroveQTouch_Example.java @@ -40,7 +40,7 @@ public class GroveQTouch_Example { Thread.sleep(1000); } catch (InterruptedException e) { // TODO Auto-generated catch block - e.printStackTrace(); + System.out.println(e.toString()); } } // ! [Interesting] diff --git a/examples/java/RPR220_intr_Example.java b/examples/java/RPR220_intr_Example.java index be9e0abc..c7f0e25d 100644 --- a/examples/java/RPR220_intr_Example.java +++ b/examples/java/RPR220_intr_Example.java @@ -24,8 +24,11 @@ public class RPR220_intr_Example { - public static int counter = 0; + private static int counter = 0; + public static void incrementCounter() { + counter++; + } public static void main(String[] args) throws InterruptedException { // ! [Interesting] // This example uses an interrupt handler to increment a counter @@ -49,6 +52,6 @@ class RPRISR implements Runnable { super(); } public void run() { - RPR220_intr_Example.counter++; + RPR220_intr_Example.incrementCounter(); } } \ No newline at end of file diff --git a/examples/java/WT5001_Example.java b/examples/java/WT5001_Example.java index 89689031..2e7a8cde 100644 --- a/examples/java/WT5001_Example.java +++ b/examples/java/WT5001_Example.java @@ -85,7 +85,7 @@ public class WT5001_Example { vol = mp3.getVolume(); System.out.println("The current volume is: " + vol); } catch (IOException e) { - e.printStackTrace(); + System.out.println(e.toString()); } try { @@ -93,7 +93,7 @@ public class WT5001_Example { ps = mp3.getPlayState(); System.out.println("The current play state is: " + ps); } catch (IOException e) { - e.printStackTrace(); + System.out.println(e.toString()); } try { @@ -101,7 +101,7 @@ public class WT5001_Example { numf = mp3.getNumFiles(upm_wt5001.WT5001.WT5001_PLAYSOURCE_T.SD); System.out.println("The number of files on the SD card is: " + numf); } catch (IOException e) { - e.printStackTrace(); + System.out.println(e.toString()); } try { @@ -109,7 +109,7 @@ public class WT5001_Example { curf = mp3.getCurrentFile(); System.out.println("The current file is: " + curf); } catch (IOException e) { - e.printStackTrace(); + System.out.println(e.toString()); } int year[] = new int[1];