pike.git/
src/
array.c
Branch:
Tag:
Non-build tags
All tags
No tags
2011-04-02
2011-04-02 12:55:21 by Martin Stjernholm <mast@lysator.liu.se>
6f3c9b1776bc9e9a344a4727dacf1eb42194fecb (
12
lines) (+
12
/-
0
)
[
Show
|
Annotate
]
Branch:
7.9
Fixed possible segfault when sorting builtin functions.
This was a regression from 3140378d.
1020:
return -1; if (a->type == T_FUNCTION) {
+
/* Sort pike functions before builtins. */
+
if (a->subtype == FUNCTION_BUILTIN) {
+
if (b->subtype == FUNCTION_BUILTIN)
+
return a->u.efun < b->u.efun ? -1 : (a->u.efun == b->u.efun ? 0 : 1);
+
else
+
return 1;
+
}
+
else
+
if (b->subtype == FUNCTION_BUILTIN)
+
return -1;
+
if (a->u.object->prog != b->u.object->prog) return a->u.object->prog < b->u.object->prog ? -1 : 1; if (a->subtype != b->subtype)