rdiscount 2.2.7.2 → 2.2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cf15c9535d4e5016d31ce5259672abac80df8a2e5669adc6e0cb91e8b1fc7d5
-  data.tar.gz: 49d680d21cadadce16d98786249999d0546ff513f043feebbaf4b86aac8a77f5
+  metadata.gz: 0a482c6d06757896511681393e99f986552e02fd6735e55cf0f665a6543a058e
+  data.tar.gz: adc56e6fd1359cdfdd955f2262ecc18376c0d6a822d0476a713fe3cccb468991
 SHA512:
-  metadata.gz: 90c7ade6956dc384ba04e2fb212caab6cc3f8b8ef6ee4126114a8bfd668f6dececcabd206c048e31a58d8e1d06d337bd5ba77f94fb4d0e43f8739674fad73acd
-  data.tar.gz: 8e4083908e90fb651cae41fa04c5e059593fe80571cb495e39c500b5baf67f788260c85ba8b778fc5e78800c68e94a4c21a832cb424c7e054ece2365e4b92156
+  metadata.gz: 8d244073c29884550875767cedbb065b760d1d690e51558f67429fe3516665e2ab5758298d3aaed68f5e1242c7a116afa00578cf7d89d067ab681eb3a08d1472
+  data.tar.gz: c2e1999790db93a98d6a5d65ea3f9a8ff1010e49fc678f5baba006f0af61f24123f05bfecc08649dbd13bdbe58198da855d9584bf0c42bd1b5b5217422c4a92e

data/BUILDING

@@ -47,13 +47,9 @@ Copy the new Discount sources to the appropriate directories for RDiscount:
 
     $ rake gather
 
-Update rdiscount.gemspec to include all *.c, *.h, and *.rb files in
-ext. This must be done manually. Here's a quick way to get the full list:
+Update rdiscount.gemspec to include all *.c, *.h, and *.rb files in ext:
 
-    $ echo ext/*.c ext/*.h ext/*.rb ext/blocktags ext/VERSION | tr ' ' "\n" | sort
-
-(There is an old Rakefile target called "rdiscount.gemspec" that looks like it
- is designed to perform an update of these files, however I haven't tested it.)
+    $ rake rdiscount.gemspec
 
 Build the RDiscount gem. If you get errors related to missing files
 in ext, make sure you updated the gemspec correctly in the previous step.

data/CHANGELOG.md

@@ -0,0 +1,126 @@
+# RDiscount Changelog
+
+## Version 2.2.7.4 <small>(April 1, 2026)</small>
+
+* Fix crash if `to_html` called on a string longer than INT_MAX (2 GiB of text).
+
+## Version 2.2.7.3 <small>(December 31, 2023)</small>
+
+* Add Ruby 3.2 and 3.3 to continuous integration
+* Reinstate fix for compilation issue with Clang 16
+
+## Version 2.2.7.2 <small>(December 19, 2023)</small>
+
+* Discount upgraded from 2.2.7c -> 2.2.7d
+    * Fix compilation on openSUSE Tumbleweed
+
+## Version 2.2.7.1 <small>(June 16, 2023)</small>
+
+* Fix to not filter out `<style>` tags by default in Markdown output,
+  unless `filter_styles` is enabled
+* Fix compilation issue with Clang 16
+* Add TruffleRuby to continuous integration
+
+## Version 2.2.7 <small>(October 23, 2022)</small>
+
+* Discount upgraded from 2.2.0 -> 2.2.7c
+    * Implement support for :latex
+    * Implement support for :explicitlist
+* Move CI to GitHub action and fix CI builds (Ruby 2.7 - 3.1)
+* Drop support for all EOL Ruby versions (eg > 2.7)
+* Fixing conformance tests to run version 1.0 and 1.0.3
+
+## Version 2.2.0.2 <small>(August 9, 2020)</small>
+
+* Fix compilation error on macOS Big Sur Preview (11.0).
+* Enable continuous integration with Ruby 2.4-2.6.
+* Builds with Ruby 2.7.0 locally but not on Travis CI.
+
+## Version 2.2.0.1 <small>(May 7, 2016)</small>
+
+* Discount upgraded from 2.1.8 -> 2.2.0
+* Fix compilation error on MSVC (Windows).
+* Enable continuous integration with Ruby 2.3.0.
+
+## Version 2.1.8 <small>(February 1, 2015)</small>
+
+* Compatible with Ruby 2.2.
+* Discount upgraded from 2.1.7 -> 2.1.8
+    * GitHub-style language attributes on fenced code blocks.
+    * Long numeric list items.
+    * Fix footnote numbering inside of nested elements.
+    * Fix a bug where autolink + github flavored markdown absorbs the ^C eoln character into a link at the end of a line.
+
+## Version 2.1.7.1 <small>(April 12, 2014)</small>
+
+* Compatible with Xcode 5.1's clang on OS X.
+
+## Version 2.1.7 <small>(October 13, 2013)</small>
+
+* Discount upgraded from 2.1.6 -> 2.1.7
+    * GFM fenced code blocks support a language identifier.
+* Definition lists:
+    * [Discount-style definition lists](http://www.pell.portland.or.us/~orc/Code/discount/#dl)
+    * [PHP Markdown Extra definition lists](http://michelf.ca/projects/php-markdown/extra/#def-list)
+
+## Version 2.1.6 <small>(May 28, 2013)</small>
+
+* Discount upgraded from 2.0.7 -> 2.1.6
+    * Fenced code blocks
+        * backtick-delimited – from GitHub Flavored Markdown
+        * tilde-delimited – from PHP Markdown Extra
+    * New extensions:
+        * `:no_superscript` - Disables superscript processing.
+        * `:no_strikethrough` - Disables strikethrough processing.
+    * License changed from 4-clause BSD to the more-permissive 3-clause BSD.
+    * Fix `--` and `---` to be converted to `&ndash;` and `&mdash;` correctly.
+    * Fix handling of tables that have leading and trailing pipe characters.
+    * Fix generated table of contents to be valid HTML.
+      Handling of special characters in headings is also improved.
+    * Fix recognition of HTML tags that contain - or _.
+
+## Version 2.0.7.3 <small>(May 7, 2013)</small>
+
+* Fix usage of deallocated memory when manipulating locale information.
+    * Special thanks to Dirkjan Bussink (@dbussink) for identifying this bug and providing the initial fix.
+* Fix outdated links. Notably the API reference.
+* Setup continuous integration.
+
+## Version 2.0.7.2 <small>(Apr 6, 2013)</small>
+
+* Fix compile error on Windows.
+* Disallow install on Ruby 1.9.2, due to known bugs in Ruby.
+    * Please upgrade to Ruby 1.9.3 or later.
+
+## Version 2.0.7.1 <small>(Feb 26, 2013)</small>
+
+* Discount upgraded from 2.0.7 (non-final) -> 2.0.7
+* Fix encoding of Unicode characters in URLs.
+
+## Version 2.0.7 <small>(Jan 29, 2013)</small>
+
+### New Features
+
+* Discount upgraded from 1.6.8 -> 2.0.7 (non-final)
+    * Footnotes - from *PHP Markdown Extra*
+    * Superscript tweaks
+        * Be more picky about what comes before a ^ if we’re superscripting.
+        * Modify superscript grabbing so that it grabs parenthetical and alphanumeric blocks.
+    * Other bug fixes
+        * Table-of-contents generation will no longer crash for header items containing links.
+        * Adjacent new-style [link]s are no longer incorrectly combined.
+
+### Known Issues
+
+* Fails to build with MinGW or MinGW-64.
+* Regression: Tags containing dashes and underscores are not escaped correctly.
+    * This will be fixed in RDiscount 2.1.5
+
+## Version 1.6.8 <small>(Jan 25, 2011)</small>
+
+* Discount upgraded from 1.6.5 -> 1.6.8
+* Fix escaping of tags containing dashes and underscores.
+
+## Earlier Releases
+
+* Inspect the Git history.

data/Rakefile

@@ -138,7 +138,7 @@ task :gather => 'discount/markdown.h' do |t|
   ]
   
   # Ensure configure.sh was run
-  if not File.exists? 'discount/mkdio.h'
+  if not File.exist? 'discount/mkdio.h'
     abort "discount/mkdio.h not found. Did you run ./configure.sh in the discount directory?"
   end
   
@@ -171,6 +171,9 @@ task :gather => 'discount/markdown.h' do |t|
   
   # Copy man page
   cp 'discount/markdown.7', 'man/'
+  
+  # Apply patches
+  system('cat ext.diff | patch -p1 -d ext')
 end
 
 file 'discount/markdown.h' do |t|
@@ -222,7 +225,11 @@ file 'rdiscount.gemspec' => FileList['Rakefile','lib/rdiscount.rb'] do |f|
   files = `git ls-files`.
     split("\n").
     sort.
-    reject{ |file| file =~ /^\./ || file =~ /^test\/MarkdownTest/ }.
+    reject{|file| 
+      file =~ /^\./ || 
+      file =~ /^test\/MarkdownTest/ || 
+      file =~ /^CLAUDE\.md|ext\.diff$/
+    }.
     map{ |file| "    #{file}" }.
     join("\n")
   # piece file back together and write...

data/ext/generate.c

@@ -180,13 +180,18 @@ Qprintf(MMIOT *f, char *fmt, ...)
 }
 
 
+static int Qchar_mkd_sta_function_t(const int n, const void* iot) {
+  Qchar(n, iot);
+}
+
+
 /* Qanchor() prints out a suitable-for-id-tag version of a string
  */
 static void
 Qanchor(struct line *p, MMIOT *f)
 {
     mkd_string_to_anchor(T(p->text), S(p->text),
-			 (mkd_sta_function_t)Qchar, f, 1, f);
+			 Qchar_mkd_sta_function_t, f, 1, f);
 }
 
 

data/ext/gethopt.c

@@ -45,8 +45,7 @@ struct h_context *ctx;
 
 
 int
-hopterr(ctx,val)
-struct h_context *ctx;
+hopterr(struct h_context *ctx, int val)
 {
     int old = ctx->opterr;
     

data/ext/rdiscount.c

@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <limits.h>
 #include <locale.h>
 #include "ruby.h"
 #include "mkdio.h"
@@ -43,6 +44,18 @@ static AccessorFlagPair ACCESSOR_2_FLAG[] = {
 
 static VALUE rb_cRDiscount;
 
+static int
+rb_rdiscount__text_len(VALUE text)
+{
+    long text_len = RSTRING_LEN(text);
+
+    if (text_len > INT_MAX) {
+        rb_raise(rb_eArgError, "markdown input too large");
+    }
+
+    return (int)text_len;
+}
+
 int rb_rdiscount__get_flags(VALUE ruby_obj)
 {
     AccessorFlagPair *entry;
@@ -78,8 +91,10 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
     int szres;
     VALUE encoding;
     VALUE text = rb_funcall(self, rb_intern("text"), 0);
-    VALUE buf = rb_str_buf_new(1024);
     Check_Type(text, T_STRING);
+    int text_len = rb_rdiscount__text_len(text);  // may rb_raise
+    
+    VALUE buf = rb_str_buf_new(1024);
 
     int flags = rb_rdiscount__get_flags(self);
     
@@ -94,7 +109,7 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
     char *old_locale = strdup(setlocale(LC_CTYPE, NULL));
     setlocale(LC_CTYPE, "C");   /* ASCII (and passthru characters > 127) */
 
-    MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
+    MMIOT *doc = mkd_string(RSTRING_PTR(text), text_len, flags);
 
     if ( mkd_compile(doc, flags) ) {
         szres = mkd_document(doc, &res);
@@ -129,11 +144,12 @@ rb_rdiscount_toc_content(int argc, VALUE *argv, VALUE self)
     /* grab char pointer to markdown input text */
     VALUE text = rb_funcall(self, rb_intern("text"), 0);
     Check_Type(text, T_STRING);
+    int text_len = rb_rdiscount__text_len(text);  // may rb_raise
 
     /* allocate a ruby string buffer and wrap it in a stream */
     VALUE buf = rb_str_buf_new(4096);
 
-    MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
+    MMIOT *doc = mkd_string(RSTRING_PTR(text), text_len, flags);
 
     if ( mkd_compile(doc, flags) ) {
         szres = mkd_toc(doc, &res);

data/ext/toc.c

@@ -15,6 +15,11 @@
 #include "markdown.h"
 #include "amalloc.h"
 
+static int Csputc_mkd_sta_function_t(const int n, const void* iot) {
+  Csputc(n, iot);
+}
+
+
 /* write an header index
  */
 int
@@ -64,7 +69,7 @@ mkd_toc(Document *p, char **doc)
 		    Csprintf(&res, "%*s<li><a href=\"#", srcp->hnumber, "");
 		    mkd_string_to_anchor(T(srcp->text->text),
 					 S(srcp->text->text),
-					 (mkd_sta_function_t)Csputc,
+					 Csputc_mkd_sta_function_t,
 					 &res,1,p->ctx);
 		    Csprintf(&res, "\">");
 		    Csreparse(&res, T(srcp->text->text),

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '2.2.7.2'
+  VERSION = '2.2.7.4'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '2.2.7.2'
+  s.version = '2.2.7.4'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
   s.email = 'david@dafoster.net'
   s.homepage = 'http://dafoster.net/projects/rdiscount/'
@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     BUILDING
+    CHANGELOG.md
     COPYING
     README.markdown
     Rakefile
@@ -44,7 +45,6 @@ Gem::Specification.new do |s|
     ext/pgm_options.h
     ext/rdiscount.c
     ext/resource.c
-    ext/ruby-config.h
     ext/setup.c
     ext/tags.c
     ext/tags.h

data/test/rdiscount_test.rb

@@ -21,6 +21,25 @@ class RDiscountTest < Test::Unit::TestCase
     RDiscount.new(text).to_html
   end
 
+  def test_that_oversized_input_raises_argument_error
+    # mkd_string() takes an int length, so inputs > INT_MAX (2 147 483 647 bytes)
+    # must be rejected before reaching C to avoid integer truncation / overflow.
+    int_max = 2_147_483_647  # INT_MAX in C
+    begin
+      oversized_text = 'a' * (int_max + 1)
+    # ArgumentError on TruffleRuby; RangeError on Windows
+    rescue NoMemoryError, ArgumentError, RangeError
+      # `omit` is Test::Unit's native skip; `skip` is Minitest's. Support both.
+      respond_to?(:omit, true) ?
+        omit("Insufficient memory to create oversized input for this test") :
+        skip("Insufficient memory to create oversized input for this test")
+    end
+
+    assert_raise(ArgumentError) do
+      RDiscount.new(oversized_text).to_html
+    end
+  end
+
   def test_that_smart_converts_double_quotes_to_curly_quotes
     rd = RDiscount.new(%("Quoted text"), :smart)
     assert_equal %(<p>&ldquo;Quoted text&rdquo;</p>\n), rd.to_html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdiscount
 version: !ruby/object:Gem::Version
-  version: 2.2.7.2
+  version: 2.2.7.4
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,12 +9,10 @@ authors:
 - Andrew White
 - David Foster
 - l33tname
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2026-04-02 00:00:00.000000000 Z
 dependencies: []
-description:
 email: david@dafoster.net
 executables:
 - rdiscount
@@ -24,6 +22,7 @@ extra_rdoc_files:
 - COPYING
 files:
 - BUILDING
+- CHANGELOG.md
 - COPYING
 - README.markdown
 - Rakefile
@@ -58,7 +57,6 @@ files:
 - ext/pgm_options.h
 - ext/rdiscount.c
 - ext/resource.c
-- ext/ruby-config.h
 - ext/setup.c
 - ext/tags.c
 - ext/tags.h
@@ -80,7 +78,6 @@ homepage: http://dafoster.net/projects/rdiscount/
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Fast Implementation of Gruber's Markdown in C
 test_files:

data/ext/ruby-config.h

@@ -1,10 +0,0 @@
-// These data types may be already defined if building on Windows (using MinGW)
-#ifndef DWORD
-  #define DWORD unsigned int
-#endif
-#ifndef WORD
-  #define WORD unsigned short
-#endif
-#ifndef BYTE
-  #define BYTE unsigned char
-#endif