diff options
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | lib/mruby/build.rb | 3 | ||||
| -rw-r--r-- | mrbgems/mruby-io/src/io.c | 2 | ||||
| -rw-r--r-- | src/class.c | 5 | ||||
| -rw-r--r-- | src/string.c | 2 |
5 files changed, 13 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 2d83cbcdf..7d6d82457 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,14 @@ language: c -sudo: false - -matrix: +jobs: - os: linux - sudo: false - os: osx before_install: - - brew install bison + - HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 brew install bison - export PATH="/usr/local/opt/bison/bin:$PATH" env: - MRUBY_CONFIG=travis_config.rb -script: "rake -m && rake test" + +script: + - rake -m && rake test diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 5c7832dff..8154b2b19 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -336,7 +336,8 @@ EOS puts " Binaries: #{@bins.join(', ')}" unless @bins.empty? unless @gems.empty? puts " Included Gems:" - @gems.map do |gem| + gems = @gems.sort_by { |gem| gem.name } + gems.each do |gem| gem_version = " - #{gem.version}" if gem.version != '0.0.0' gem_summary = " - #{gem.summary}" if gem.summary puts " #{gem.name}#{gem_version}#{gem_summary}" diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c index 57f4025d6..3d9d2b48a 100644 --- a/mrbgems/mruby-io/src/io.c +++ b/mrbgems/mruby-io/src/io.c @@ -1493,7 +1493,7 @@ mrb_io_readchar(mrb_state *mrb, mrb_value self) #endif mrb_get_args(mrb, "S", &buf); - mrb_assert(RSTRING_PTR(buf) > 0); + mrb_assert(RSTRING_PTR(buf) != NULL); mrb_str_modify(mrb, RSTRING(buf)); #ifdef MRB_UTF8_STRING c = RSTRING_PTR(buf)[0]; diff --git a/src/class.c b/src/class.c index b0af74e74..d30edd41e 100644 --- a/src/class.c +++ b/src/class.c @@ -1728,7 +1728,10 @@ mrb_class_real(struct RClass* cl) MRB_API const char* mrb_class_name(mrb_state *mrb, struct RClass* c) { - mrb_value name = class_name_str(mrb, c); + mrb_value name; + + if (c == NULL) return NULL; + name = class_name_str(mrb, c); return RSTRING_PTR(name); } diff --git a/src/string.c b/src/string.c index 458c511dc..44e3c9069 100644 --- a/src/string.c +++ b/src/string.c @@ -2759,7 +2759,7 @@ mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len) MRB_API mrb_value mrb_str_cat_cstr(mrb_state *mrb, mrb_value str, const char *ptr) { - return mrb_str_cat(mrb, str, ptr, strlen(ptr)); + return mrb_str_cat(mrb, str, ptr, ptr ? strlen(ptr) : 0); } MRB_API mrb_value |