Changeset d5a89a3 in mainline for uspace/lib/c/generic/setjmp.c

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merging with upstream/master

File:

• uspace/lib/c/generic/setjmp.c (modified) (1 diff)

uspace/lib/c/generic/setjmp.c

@@ -38 +38 @@
 void longjmp(jmp_buf env, int val)
 {
-        /* __longjmp defined in assembly doesn't "correct" the value. */
-        __longjmp(env, val == 0 ? 1 : val);
+        /*
+         * The standard requires that longjmp() ensures that val is not zero.
+         * __context_restore doesn't do that, so we do it here.
+         */
+        __context_restore(env, val == 0 ? 1 : val);
 }