1 files changed, 8 insertions, 6 deletions
diff --git a/src/library.js b/src/library.js
index dfaff1fb..29c3386f 100644
--- a/src/library.js
+++ b/src/library.js
@@ -4393,7 +4393,7 @@ LibraryManager.library = {
   strcat: function(pdest, psrc) {
     pdest = pdest|0; psrc = psrc|0;
     var i = 0;
-    pdest = (pdest + _strlen(pdest))|0;
+    pdest = (pdest + (_strlen(pdest)|0))|0;
     do {
       {{{ makeCopyValues('pdest+i', 'psrc+i', 1, 'i8', null, 1) }}};
       i = (i+1)|0;
@@ -4457,8 +4457,8 @@ LibraryManager.library = {
     px = px|0; py = py|0; n = n|0;
     var i = 0, x = 0, y = 0;
     while ((i>>>0) < (n>>>0)) {
-      x = _tolower({{{ makeGetValueAsm('px', 'i', 'i8', 0, 1) }}});
-      y = _tolower({{{ makeGetValueAsm('py', 'i', 'i8', 0, 1) }}});
+      x = _tolower({{{ makeGetValueAsm('px', 'i', 'i8', 0, 1) }}})|0;
+      y = _tolower({{{ makeGetValueAsm('py', 'i', 'i8', 0, 1) }}})|0;
       if (((x|0) == (y|0)) & ((x|0) == 0)) return 0;
       if ((x|0) == 0) return -1;
       if ((y|0) == 0) return 1;
@@ -6176,6 +6176,7 @@ LibraryManager.library = {
 
   saveSetjmp__asm: true,
   saveSetjmp__sig: 'iii',
+  saveSetjmp__deps: ['putchar'],
   saveSetjmp: function(env, label, table) {
     // Not particularly fast: slow table lookup of setjmpId to label. But setjmp
     // prevents relooping anyhow, so slowness is to be expected. And typical case
@@ -6189,7 +6190,7 @@ LibraryManager.library = {
 #endif
     setjmpId = (setjmpId+1)|0;
     {{{ makeSetValueAsm('env', '0', 'setjmpId', 'i32') }}};
-    while ((i|0) < {{{ MAX_SETJMPS }}}) {
+    while ((i|0) < {{{ 2*MAX_SETJMPS }}}) {
       if ({{{ makeGetValueAsm('table', 'i*4', 'i32') }}} == 0) {
         {{{ makeSetValueAsm('table', 'i*4', 'setjmpId', 'i32') }}};
         {{{ makeSetValueAsm('table', 'i*4+4', 'label', 'i32') }}};
@@ -6199,7 +6200,8 @@ LibraryManager.library = {
       }
       i = (i+2)|0;
     }
-    abort(987); // if you hit this, adjust MAX_SETJMPS
+    {{{ makePrintChars('too many setjmps in a function call, build with a higher value for MAX_SETJMPS') }}};
+    abort(0);
     return 0;
   },
 
@@ -6226,7 +6228,7 @@ LibraryManager.library = {
   setjmp__inline: function(env) {
     // Save the label
 #if ASM_JS
-    return '_saveSetjmp(' + env + ', label, setjmpTable)';
+    return '_saveSetjmp(' + env + ', label, setjmpTable)|0';
 #else
     return '(tempInt = setjmpId++, mySetjmpIds[tempInt] = 1, setjmpLabels[tempInt] = label,' + makeSetValue(env, '0', 'tempInt', 'i32', undefined, undefined, undefined, undefined,  ',') + ', 0)';
 #endif