1 files changed, 32 insertions, 9 deletions

diff --git a/src/library.js b/src/library.js
index d897556f..e65754ba 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3918,7 +3918,14 @@ LibraryManager.library = {
           str++;
         }
       }
-    }
+    } else if (finalBase==16) {
+      if ({{{ makeGetValue('str', 0, 'i8') }}} == {{{ charCode('0') }}}) {
+        if ({{{ makeGetValue('str+1', 0, 'i8') }}} == {{{ charCode('x') }}} ||
+            {{{ makeGetValue('str+1', 0, 'i8') }}} == {{{ charCode('X') }}}) {
+          str += 2;
+        }
+      }      
+    } 
     if (!finalBase) finalBase = 10;
 
     // Get digits.
@@ -3969,13 +3976,14 @@ LibraryManager.library = {
 #if USE_TYPED_ARRAYS == 2
   _parseInt64__deps: ['isspace', '__setErrNo', '$ERRNO_CODES', function() { Types.preciseI64MathUsed = 1 }],
   _parseInt64: function(str, endptr, base, min, max, unsign) {
-    var start = str;
+    var isNegative = false;
     // Skip space.
     while (_isspace({{{ makeGetValue('str', 0, 'i8') }}})) str++;
-
+    
     // Check for a plus/minus sign.
     if ({{{ makeGetValue('str', 0, 'i8') }}} == {{{ charCode('-') }}}) {
       str++;
+      isNegative = true;
     } else if ({{{ makeGetValue('str', 0, 'i8') }}} == {{{ charCode('+') }}}) {
       str++;
     }
@@ -3991,12 +3999,19 @@ LibraryManager.library = {
           str += 2;
         } else {
           finalBase = 8;
-          str++;
           ok = true; // we saw an initial zero, perhaps the entire thing is just "0"
         }
       }
-    }
+    } else if (finalBase==16) {
+      if ({{{ makeGetValue('str', 0, 'i8') }}} == {{{ charCode('0') }}}) {
+        if ({{{ makeGetValue('str+1', 0, 'i8') }}} == {{{ charCode('x') }}} ||
+            {{{ makeGetValue('str+1', 0, 'i8') }}} == {{{ charCode('X') }}}) {
+          str += 2;
+        }
+      }      
+    } 
     if (!finalBase) finalBase = 10;
+    start = str;
 
     // Get digits.
     var chr;
@@ -4009,6 +4024,7 @@ LibraryManager.library = {
         ok = true;
       }
     }
+
     if (!ok) {
       ___setErrNo(ERRNO_CODES.EINVAL);
       {{{ makeStructuralReturn(['0', '0']) }}};
@@ -4020,7 +4036,8 @@ LibraryManager.library = {
     }
 
     try {
-      i64Math.fromString(Pointer_stringify(start, str - start), finalBase, min, max, unsign);
+      var numberString = isNegative ? '-'+Pointer_stringify(start, str - start) : Pointer_stringify(start, str - start);
+      i64Math.fromString(numberString, finalBase, min, max, unsign);
     } catch(e) {
       ___setErrNo(ERRNO_CODES.ERANGE); // not quite correct
     }
@@ -5088,7 +5105,13 @@ LibraryManager.library = {
     return _malloc(size);
   },
   __cxa_free_exception: function(ptr) {
-    return _free(ptr);
+    try {
+      return _free(ptr);
+    } catch(e) { // XXX FIXME
+#if ASSERTIONS
+      Module.printErr('exception during cxa_free_exception: ' + e);
+#endif
+    }
   },
   __cxa_throw__sig: 'viii',
   __cxa_throw__deps: ['llvm_eh_exception', '_ZSt18uncaught_exceptionv', '__cxa_find_matching_catch'],
@@ -6813,7 +6836,7 @@ LibraryManager.library = {
   },
   __errno_state: 0,
   __setErrNo__deps: ['__errno_state'],
-  __setErrNo__postset: '___errno_state = Runtime.staticAlloc(4);',
+  __setErrNo__postset: '___errno_state = Runtime.staticAlloc(4); {{{ makeSetValue("___errno_state", 0, 0, "i32") }}};',
   __setErrNo: function(value) {
     // For convenient setting and returning of errno.
     {{{ makeSetValue('___errno_state', '0', 'value', 'i32') }}}
@@ -7578,7 +7601,7 @@ LibraryManager.library = {
   },
 
   emscripten_run_script_int: function(ptr) {
-    return eval(Pointer_stringify(ptr));
+    return eval(Pointer_stringify(ptr))|0;
   },
 
   emscripten_run_script_string: function(ptr) {