Merge remote-tracking branch 'upstream/master'

parrot · Oct 23, 2012 · af93a6d · af93a6d
2 parents bf72c5c + 78bef79
commit af93a6d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/src/pmc/filehandle.pmc b/src/pmc/filehandle.pmc
@@ -146,6 +146,7 @@ Mark active filehandle data as live.
         Parrot_gc_mark_STRING_alive(INTERP, attrs->mode);
         Parrot_gc_mark_STRING_alive(INTERP, attrs->filename);
         Parrot_gc_mark_STRING_alive(INTERP, attrs->encoding);
+        Parrot_gc_mark_STRING_alive(INTERP, attrs->record_separator);
         Parrot_io_buffer_mark(interp, attrs->read_buffer);
         Parrot_io_buffer_mark(interp, attrs->write_buffer);
     }

diff --git a/src/pmc/socket.pmc b/src/pmc/socket.pmc
@@ -99,6 +99,8 @@ Mark active socket handle data as live.
         if (data) {
             Parrot_gc_mark_PMC_alive(INTERP, data->local);
             Parrot_gc_mark_PMC_alive(INTERP, data->remote);
+            Parrot_gc_mark_STRING_alive(INTERP, data->encoding);
+            Parrot_gc_mark_STRING_alive(INTERP, data->record_separator);
             Parrot_io_buffer_mark(interp, data->read_buffer);
             Parrot_io_buffer_mark(interp, data->write_buffer);
         }

diff --git a/src/pmc/stringhandle.pmc b/src/pmc/stringhandle.pmc
@@ -136,6 +136,7 @@ Mark active stringhandle data as live.
         Parrot_gc_mark_STRING_alive(INTERP, data_struct->mode);
         Parrot_gc_mark_STRING_alive(INTERP, data_struct->encoding);
         Parrot_gc_mark_STRING_alive(INTERP, data_struct->filename);
+        Parrot_gc_mark_STRING_alive(INTERP, data_struct->record_separator);
         Parrot_io_buffer_mark(interp, data_struct->read_buffer);
         Parrot_io_buffer_mark(interp, data_struct->write_buffer);
     }