diff options
| -rw-r--r-- | html/subx/010core.cc.html | 6 | ||||
| -rw-r--r-- | subx/010core.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/html/subx/010core.cc.html b/html/subx/010core.cc.html index 828a5b90..75843a12 100644 --- a/html/subx/010core.cc.html +++ b/html/subx/010core.cc.html @@ -249,11 +249,11 @@ if ('onhashchange' in window) { <span id="L186" class="LineNr">186 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> <span id="L187" class="LineNr">187 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> <span id="L188" class="LineNr">188 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c >= <span class="Constant">'0'</span> && c <= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span> -<span id="L189" class="LineNr">189 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c >= <span class="Constant">'a'</span> && c <= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span> -<span id="L190" class="LineNr">190 </span> <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c >= <span class="Constant">'A'</span> && c <= <span class="Constant">'F'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> tolower<span class="Delimiter">(</span>c<span class="Delimiter">);</span> +<span id="L189" class="LineNr">189 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c >= <span class="Constant">'a'</span> && c <= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span> +<span id="L190" class="LineNr">190 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c >= <span class="Constant">'A'</span> && c <= <span class="Constant">'F'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> tolower<span class="Delimiter">(</span>c<span class="Delimiter">);</span> <span id="L191" class="LineNr">191 </span> <span class="Conceal">¦</span> <span class="Comment">// disallow any non-hex characters, including a '0x' prefix</span> <span id="L192" class="LineNr">192 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>c<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L193" class="LineNr">193 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> << <span class="Constant">"invalid non-hex character '"</span> << c << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L193" class="LineNr">193 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> << <span class="Constant">"invalid non-hex character "</span> << <a href='010core.cc.html#L228'>NUM</a><span class="Delimiter">(</span>c<span class="Delimiter">)</span> << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> <span id="L194" class="LineNr">194 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L195" class="LineNr">195 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> <span id="L196" class="LineNr">196 </span> <span class="Delimiter">}</span> diff --git a/subx/010core.cc b/subx/010core.cc index 0713ec1d..42445afd 100644 --- a/subx/010core.cc +++ b/subx/010core.cc @@ -186,11 +186,11 @@ char next_hex_byte(istream& in) { } } if (c >= '0' && c <= '9') return c; - else if (c >= 'a' && c <= 'f') return c; - else if (c >= 'A' && c <= 'F') return tolower(c); + if (c >= 'a' && c <= 'f') return c; + if (c >= 'A' && c <= 'F') return tolower(c); // disallow any non-hex characters, including a '0x' prefix if (!isspace(c)) { - raise << "invalid non-hex character '" << c << "'\n" << end(); + raise << "invalid non-hex character " << NUM(c) << "\n" << end(); break; } } |