diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-24 02:53:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-24 02:53:29 +0000 |
| commit | e923de6d4ac7fca1d0a3d39c3df43015cd4b03f2 (patch) | |
| tree | e769c3d7f5ca9d996cb3afabada7a9884861514b | |
| parent | 34c35bf1074f1a32803f380526fa511414ed3d25 (diff) | |
ossl_asn1.c: fix undefined behavior
* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value
other than Symbol is an undefined behavior. fix up r31699.
[ruby-core:62142] [Bug #9771]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_asn1.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Apr 24 11:53:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value + other than Symbol is an undefined behavior. fix up r31699. + [ruby-core:62142] [Bug #9771] + Thu Apr 24 11:21:37 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (rb_sym2id, rb_sym2id_without_pindown): return 0 for diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index c2344affa6..efdfbfc8aa 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -1150,7 +1150,7 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self) } if(!SYMBOL_P(tag_class)) ossl_raise(eASN1Error, "invalid tag class"); - if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31) + if(!NIL_P(tagging) && SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31) ossl_raise(eASN1Error, "tag number for Universal too large"); } else{ |