emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

h_token: Copy string correctly.

Browse source 
See https://github.com/ffi/ffi/wiki/Core-Concepts#string-memory-allocation for additional information.
This commit is contained in:
Jakob Rath 2013-12-16 17:07:50 +01:00 • committed by Dan Hirsch
parent d53ee07499
commit 96dfad0178
3 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/bindings/ruby/lib/hammer/parser.rb
View file

@ -6,7 +6,7 @@ module Hammer
#
# name: Name of the parser. Should be a symbol.
# h_parser: The pointer to the parser as returned by hammer.
# dont_gc: Pass additional data that's used by the parser and needs to be saved from the garbage collector.
# dont_gc: Pass additional data that's used by the parser and needs to be saved from the garbage collector (at least as long this object lives).
def initialize(name, h_parser, dont_gc)
@name = name
@h_parser = h_parser
@ -34,13 +34,14 @@ module Hammer
end
def self.token(string)
# TODO:
# This might fail in JRuby.
# See "String Memory Allocation" at https://github.com/ffi/ffi/wiki/Core-Concepts
h_string = string.dup
h_parser = Hammer::Internal.h_token(h_string, h_string.length)
# Need to copy string to a memory buffer (not just string.dup)
# * Original string might be modified, this must not affect existing tokens
# * We need a constant memory address (Ruby string might be moved around by the Ruby VM)
# * Use string.length instead of h_string.size to handle multibyte characters correctly.
buffer = FFI::MemoryPointer.from_string(string)
h_parser = Hammer::Internal.h_token(buffer, string.length)
return Hammer::Parser.new(:token, h_parser, h_string)
return Hammer::Parser.new(:token, h_parser, buffer)
end
def self.ch(num)