Merge "Add input checks for Language::sprintfDate()"

diff --combined languages/Language.php
index ff87f89,7ec37a1..b9201d7
--- 1/languages/Language.php
--- 2/languages/Language.php
+++ b/languages/Language.php
@@@ -1078,6 -1078,7 +1078,7 @@@ class Language 
         * @param $zone DateTimeZone: Timezone of $ts
         * @todo handling of "o" format character for Iranian, Hebrew, Hijri & Thai?
         *
+        * @throws MWException
         * @return string
         */
        function sprintfDate( $format, $ts, DateTimeZone $zone = null ) {
@@@ -1093,6 -1094,15 +1094,15 @@@
                $thai = false;
                $minguo = false;
                $tenno = false;
+ 
+               if ( strlen( $ts ) !== 14 ) {
+                       throw new MWException( __METHOD__ . ": The timestamp $ts should have 14 characters" );
+               }
+ 
+               if ( !ctype_digit( $ts ) ) {
+                       throw new MWException( __METHOD__ . ": The timestamp $ts should be a number" );
+               }
+ 
                for ( $p = 0; $p < strlen( $format ); $p++ ) {
                        $num = false;
                        $code = $format[$p];
@@@ -1822,7 -1832,7 +1832,7 @@@
                }
                $start = substr( $str, 0, strlen( $str ) - 2 );
                $end = substr( $str, strlen( $str ) - 2 );
 -              switch( $end ) {
 +              switch ( $end ) {
                        case 'כ':
                                $str = $start . 'ך';
                                break;

diff --combined tests/phpunit/languages/LanguageTest.php
index 80f76a5,26bb2f3..54f7753
--- 1/tests/phpunit/languages/LanguageTest.php
--- 2/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@@ -1,7 -1,6 +1,6 @@@
  <?php
  
  class LanguageTest extends LanguageClassesTestCase {
- 
        function testLanguageConvertDoubleWidthToSingleWidth() {
                $this->assertEquals(
                        "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
@@@ -202,6 -201,7 +201,6 @@@
                                'formatTimePeriod() rounding, recursion, (>48h)'
                        ),
                );
 -
        }
  
        function testTruncate() {
@@@ -498,6 -498,30 +497,30 @@@
                );
        }
  
+       /**
+        * Test too short timestamp
+        * @expectedException MWException
+        */
+       function testSprintfDateTooShortTimestamp() {
+               $this->getLang()->sprintfDate( 'xiY', '1234567890123' );
+       }
+ 
+       /**
+        * Test too long timestamp
+        * @expectedException MWException
+        */
+       function testSprintfDateTooLongTimestamp() {
+               $this->getLang()->sprintfDate( 'xiY', '123456789012345' );
+       }
+ 
+       /**
+        * Test too short timestamp
+        * @expectedException MWException
+        */
+       function testSprintfDateNotAllDigitTimestamp() {
+               $this->getLang()->sprintfDate( 'xiY', '-1234567890123' );
+       }
+ 
        /**
         * @dataProvider provideSprintfDateSamples
         */