<!DOCTYPE html>
<html>
  <head>
  </head>
  <body>
    <dl style="line-height: 1.5; margin-left: 2em">
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
      <dd style="margin-left: 8.5em">Kouhei Sutou &lt;kou****@clear*****&gt;</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
      <dd style="margin-left: 8.5em">2015-01-03 14:38:17 +0900 (Sat, 03 Jan 2015)</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
      <dd style="margin-left: 8.5em"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436">2a6522208f1b5feb82169a5861c63e2e1cc0c436</a></dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
      <dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">select match_columns: report error for invalid match_columns

GitHub: #269

Reported by Naoya Murakami. Thanks!!!</pre></dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
      <dd style="margin-left: 8.5em">
        <ul>
          <li><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#diff-0">lib/expr.c</a></li>
        </ul>
      </dd>
    </dl>

    <div class="diff-section" style="clear: both">
      <table style="border-collapse: collapse; border: 1px solid #aaa">
        <thead>
          <tr class="diff-header" style="border: 1px solid #aaa">
            <td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">  Modified: lib/expr.c (+18 -0)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
            </td>
          </tr>
        </thead>
        <tbody>
          <tr>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4662">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4663">4663</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4664">4664</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4665">4665</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4666">4666</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4667">4667</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4668">4668</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4826">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4827">4827</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4828">4828</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4829">4829</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4830">4830</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4831">4831</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0L4832">4832</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4662">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4663">4663</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4664">4664</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4665">4665</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4666">4666</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4667">4667</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4668">4668</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4669">4669</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4670">4670</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4671">4671</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4672">4672</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4673">4673</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4674">4674</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4675">4675</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4676">4676</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4677">4677</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4678">4678</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4679">4679</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4680">4680</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4838">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4839">4839</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4840">4840</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4841">4841</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4842">4842</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4843">4843</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4844">4844</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4845">4845</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4846">4846</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4847">4847</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4848">4848</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4849">4849</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/2a6522208f1b5feb82169a5861c63e2e1cc0c436#L0R4850">4850</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -4663,6 +4663,18 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">scan_info_build_match(grn_ctx *ctx, scan_info *si)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">               ec += offset;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">             }</span>
<span class="diff-not-changed" style="display: block; white-space: pre">             break;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+          default :</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+            {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+              char name[GRN_TABLE_MAX_KEY_SIZE];</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+              int name_size;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+              name_size = grn_obj_name(ctx, ec-&gt;value,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                                       name, GRN_TABLE_MAX_KEY_SIZE);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+              ERR(GRN_INVALID_ARGUMENT,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                  &quot;invalid match target: &lt;%.*s&gt;&quot;,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+                  name_size, name);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+              return;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+            }</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+            break;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">           }</span>
<span class="diff-not-changed" style="display: block; white-space: pre">         }</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       }</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -4827,6 +4839,12 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">scan_info_build(grn_ctx *ctx, grn_obj *expr, int *n,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">       si-&gt;end = c - e-&gt;codes;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       sis[i++] = si;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       scan_info_build_match(ctx, si);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+      if (ctx-&gt;rc != GRN_SUCCESS) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+        int j;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+        for (j = 0; j &lt; i; j++) { SI_FREE(sis[j]); }</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+        GRN_FREE(sis);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+        return NULL;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+      }</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       si = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       break;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     case GRN_OP_AND :</span>
</pre>
            </td>
          </tr>
        </tbody>
      </table>
    </div>
  </body>
</html>