From 887f7540148c24fb11836038dd9dd403769e968d Mon Sep 17 00:00:00 2001
From: Roman <roman@softaria.com>
Date: Fri, 25 Mar 2011 16:46:26 +0600
Subject: [PATCH] Hidden NPE fixed, which appeared when someone pass null as
 arguments (for such SQL as e.g. CREATE TABLE).

It is especially important when work with dome 3d party persistemce
libraries, like e.g. http://github.com/zefhemel/persistencejs which
passes these nulls.
---
 framework/src/com/phonegap/Storage.java | 158 ++++++++++++++----------
 1 file changed, 91 insertions(+), 67 deletions(-)
 mode change 100755 => 100644 framework/src/com/phonegap/Storage.java

diff --git a/framework/src/com/phonegap/Storage.java b/framework/src/com/phonegap/Storage.java
old mode 100755
new mode 100644
index de30afb2..67fc6f3e
--- a/framework/src/com/phonegap/Storage.java
+++ b/framework/src/com/phonegap/Storage.java
@@ -16,15 +16,15 @@ import android.database.Cursor;
 import android.database.sqlite.*;
 
 /**
- * This class implements the HTML5 database support for Android 1.X devices.  
- * It is not used for Android 2.X, since HTML5 database is built in to the browser.
+ * This class implements the HTML5 database support for Android 1.X devices. It
+ * is not used for Android 2.X, since HTML5 database is built in to the browser.
  */
 public class Storage extends Plugin {
-	
-	SQLiteDatabase myDb = null;		// Database object
-	String path = null;				// Database path
-	String dbName = null;			// Database name
-	
+
+	SQLiteDatabase myDb = null; // Database object
+	String path = null; // Database path
+	String dbName = null; // Database name
+
 	/**
 	 * Constructor.
 	 */
@@ -34,29 +34,37 @@ public class Storage extends Plugin {
 	/**
 	 * Executes the request and returns PluginResult.
 	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
+	 * @param action
+	 *            The action to execute.
+	 * @param args
+	 *            JSONArry of arguments for the plugin.
+	 * @param callbackId
+	 *            The callback id used when calling back into JavaScript.
+	 * @return A PluginResult object with a status and message.
 	 */
 	public PluginResult execute(String action, JSONArray args, String callbackId) {
 		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
+		String result = "";
+
 		try {
-			// TODO: Do we want to allow a user to do this, since they could get to other app databases?
+			// TODO: Do we want to allow a user to do this, since they could get
+			// to other app databases?
 			if (action.equals("setStorage")) {
 				this.setStorage(args.getString(0));
-			}
-			else if (action.equals("openDatabase")) {
-				this.openDatabase(args.getString(0), args.getString(1), args.getString(2), args.getLong(3));
-			}
-			else if (action.equals("executeSql")) {
-				JSONArray a = args.getJSONArray(1);
-				int len = a.length();
-				String[] s = new String[len];
-				for (int i=0; i<len; i++) {
-					s[i] = a.getString(i);
+			} else if (action.equals("openDatabase")) {
+				this.openDatabase(args.getString(0), args.getString(1),
+						args.getString(2), args.getLong(3));
+			} else if (action.equals("executeSql")) {
+				String[] s = null;
+				if (args.isNull(1)) {
+					s = new String[0];
+				} else {
+					JSONArray a = args.getJSONArray(1);
+					int len = a.length();
+					s = new String[len];
+					for (int i = 0; i < len; i++) {
+						s[i] = a.getString(i);
+					}
 				}
 				this.executeSql(args.getString(0), s, args.getString(2));
 			}
@@ -67,15 +75,17 @@ public class Storage extends Plugin {
 	}
 
 	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
+	 * Identifies if action to be executed returns a value and should be run
+	 * synchronously.
 	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
+	 * @param action
+	 *            The action to execute
+	 * @return T=returns value
 	 */
 	public boolean isSynch(String action) {
 		return false;
 	}
-	
+
 	/**
 	 * Clean up and close database.
 	 */
@@ -87,33 +97,40 @@ public class Storage extends Plugin {
 		}
 	}
 
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
+	// --------------------------------------------------------------------------
+	// LOCAL METHODS
+	// --------------------------------------------------------------------------
 
 	/**
-	 * Set the application package for the database.  Each application saves its 
-	 * database files in a directory with the application package as part of the file name.
+	 * Set the application package for the database. Each application saves its
+	 * database files in a directory with the application package as part of the
+	 * file name.
 	 * 
 	 * For example, application "com.phonegap.demo.Demo" would save its database
 	 * files in "/data/data/com.phonegap.demo/databases/" directory.
 	 * 
-	 * @param appPackage			The application package.
+	 * @param appPackage
+	 *            The application package.
 	 */
 	public void setStorage(String appPackage) {
 		this.path = "/data/data/" + appPackage + "/databases/";
 	}
-	
+
 	/**
 	 * Open database.
 	 * 
-	 * @param db					The name of the database
-	 * @param version				The version
-	 * @param display_name			The display name
-	 * @param size					The size in bytes
+	 * @param db
+	 *            The name of the database
+	 * @param version
+	 *            The version
+	 * @param display_name
+	 *            The display name
+	 * @param size
+	 *            The size in bytes
 	 */
-	public void openDatabase(String db, String version, String display_name, long size)	{
-		
+	public void openDatabase(String db, String version, String display_name,
+			long size) {
+
 		// If database is open, then close it
 		if (this.myDb != null) {
 			this.myDb.close();
@@ -121,54 +138,60 @@ public class Storage extends Plugin {
 
 		// If no database path, generate from application package
 		if (this.path == null) {
-	        Package pack = this.ctx.getClass().getPackage();
-	        String appPackage = pack.getName();
-	        this.setStorage(appPackage);
+			Package pack = this.ctx.getClass().getPackage();
+			String appPackage = pack.getName();
+			this.setStorage(appPackage);
 		}
-	        
+
 		this.dbName = this.path + db + ".db";
 		this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null);
 	}
-	
+
 	/**
 	 * Execute SQL statement.
 	 * 
-	 * @param query				The SQL query
-	 * @param params			Parameters for the query
-	 * @param tx_id				Transaction id
+	 * @param query
+	 *            The SQL query
+	 * @param params
+	 *            Parameters for the query
+	 * @param tx_id
+	 *            Transaction id
 	 */
 	public void executeSql(String query, String[] params, String tx_id) {
 		try {
 			Cursor myCursor = this.myDb.rawQuery(query, params);
 			this.processResults(myCursor, tx_id);
 			myCursor.close();
-		} 
-		catch (SQLiteException ex) {
+		} catch (SQLiteException ex) {
 			ex.printStackTrace();
-			System.out.println("Storage.executeSql(): Error=" +  ex.getMessage());
-			
+			System.out
+					.println("Storage.executeSql(): Error=" + ex.getMessage());
+
 			// Send error message back to JavaScript
-			this.sendJavascript("droiddb.fail('" + ex.getMessage() + "','" + tx_id + "');");
+			this.sendJavascript("droiddb.fail('" + ex.getMessage() + "','"
+					+ tx_id + "');");
 		}
 	}
-	
+
 	/**
 	 * Process query results.
 	 * 
-	 * @param cur				Cursor into query results
-	 * @param tx_id				Transaction id
+	 * @param cur
+	 *            Cursor into query results
+	 * @param tx_id
+	 *            Transaction id
 	 */
 	public void processResults(Cursor cur, String tx_id) {
-		
+
 		String result = "[]";
 		// If query result has rows
-		
+
 		if (cur.moveToFirst()) {
 			JSONArray fullresult = new JSONArray();
 			String key = "";
 			String value = "";
 			int colCount = cur.getColumnCount();
-			
+
 			// Build up JSON result object for each row
 			do {
 				JSONObject row = new JSONObject();
@@ -179,19 +202,20 @@ public class Storage extends Plugin {
 						row.put(key, value);
 					}
 					fullresult.put(row);
-					
+
 				} catch (JSONException e) {
 					e.printStackTrace();
 				}
-				
+
 			} while (cur.moveToNext());
-			
+
 			result = fullresult.toString();
 		}
-		
+
 		// Let JavaScript know that there are no more rows
-		this.sendJavascript("droiddb.completeQuery('" + tx_id + "', "+result+");");
-		
+		this.sendJavascript("droiddb.completeQuery('" + tx_id + "', " + result
+				+ ");");
+
 	}
-		
+
 }
\ No newline at end of file