Updated Branches:
  refs/heads/develop 4cbd55087 -> 531f7f2fe

Fixed checking of null parameters


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3d993d18
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3d993d18
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3d993d18

Branch: refs/heads/develop
Commit: 3d993d18006b3ecf75b2c33d24e9bdd0170287f4
Parents: 4cbd550
Author: Justin Mclean <[email protected]>
Authored: Sat Apr 20 10:22:38 2013 +1000
Committer: Justin Mclean <[email protected]>
Committed: Sat Apr 20 10:22:38 2013 +1000

----------------------------------------------------------------------
 .../projects/mx/src/mx/controls/DateField.as       |   17 ++++++++------
 1 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3d993d18/frameworks/projects/mx/src/mx/controls/DateField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/DateField.as 
b/frameworks/projects/mx/src/mx/controls/DateField.as
index 5950f5c..e6eab28 100644
--- a/frameworks/projects/mx/src/mx/controls/DateField.as
+++ b/frameworks/projects/mx/src/mx/controls/DateField.as
@@ -465,7 +465,12 @@ public class DateField extends ComboBase
                var dateParts:Array = [];
                var maskParts:Array = [];
         var part:int = 0;
-               var length:int = valueString.length;
+               var length:int;
+               
+               if (valueString == null || inputFormat == null)
+                       return null;
+               
+               length = valueString.length;
                
                dateParts[part] = "";
         for (var i:int = 0; i < length; i++)
@@ -572,16 +577,14 @@ public class DateField extends ComboBase
     {
                var maskChar:String;
                var maskParts:Array = [];
-               var part:int = 0;
-               var length:int = outputFormat.length;
+               var part:int = -1;
+               var length:int;
+               var lastChar:String;
                
-               if (!value || isNaN(value.getTime()))
+               if (!value || isNaN(value.getTime()) || !outputFormat)
                        return "";
                
                length = outputFormat.length;
-               part = -1;
-
-               var lastChar:String;
                
                for (var i:int = 0; i < length; i++)
                {

Reply via email to