Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
17bd40a5
Commit
17bd40a5
authored
Jan 19, 2016
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3087 from kou/fix-segv-on-rerasing-no-memory-error
Fix SEGV on re-raising NoMemoryError
parents
70d24a9e
1d84b320
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
src/gc.c
src/gc.c
+1
-0
src/vm.c
src/vm.c
+5
-4
No files found.
src/gc.c
View file @
17bd40a5
...
@@ -215,6 +215,7 @@ mrb_realloc(mrb_state *mrb, void *p, size_t len)
...
@@ -215,6 +215,7 @@ mrb_realloc(mrb_state *mrb, void *p, size_t len)
p2
=
mrb_realloc_simple
(
mrb
,
p
,
len
);
p2
=
mrb_realloc_simple
(
mrb
,
p
,
len
);
if
(
!
p2
&&
len
)
{
if
(
!
p2
&&
len
)
{
if
(
mrb
->
gc
.
out_of_memory
)
{
if
(
mrb
->
gc
.
out_of_memory
)
{
mrb_exc_raise
(
mrb
,
mrb_obj_value
(
mrb
->
nomem_err
));
/* mrb_panic(mrb); */
/* mrb_panic(mrb); */
}
}
else
{
else
{
...
...
src/vm.c
View file @
17bd40a5
...
@@ -256,12 +256,13 @@ static void
...
@@ -256,12 +256,13 @@ static void
cipop
(
mrb_state
*
mrb
)
cipop
(
mrb_state
*
mrb
)
{
{
struct
mrb_context
*
c
=
mrb
->
c
;
struct
mrb_context
*
c
=
mrb
->
c
;
struct
REnv
*
env
=
c
->
ci
->
env
;
if
(
c
->
ci
->
env
)
{
mrb_env_unshare
(
mrb
,
c
->
ci
->
env
);
}
c
->
ci
--
;
c
->
ci
--
;
if
(
env
)
{
mrb_env_unshare
(
mrb
,
env
);
}
}
}
void
mrb_exc_set
(
mrb_state
*
mrb
,
mrb_value
exc
);
void
mrb_exc_set
(
mrb_state
*
mrb
,
mrb_value
exc
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment