← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vim/maverick

« back to all changes in this revision

Viewing changes to src/ex_cmds.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2008-06-26 13:42:18 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080626134218-703edeyb8k70qpbz
Tags: 1:7.1.314-3ubuntu1
https://launchpad.net/bugs/240216
* Resynchronise with Debian. Remaining changes:
  - Enable detection of GNU screen as a mouse-capable terminal.
  - Add NoDisplay=true to gvim.desktop.
  - Drop vim-lesstif package and lesstif2-dev build-dependency.
  - Build-depend on libxt-dev.
  - Enable Python interpreter on basic builds.
  - Create a .pot file for translations.
  - Disable autoindent, line-wrapping, and backup files by default.
* Fixes various vulnerabilities due to improper quoting of 'execute'
  arguments (LP: #240216).
* Drop fixes for upgrade problems from Ubuntu 6.06 LTS; direct upgrades
  from 6.06 to 8.10 will not be supported.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ex_cmds.c
1160
1160
    if (!do_out)
1161
1161
        msg_putchar('\n');
1162
1162
 
 
1163
    /* Create the shell command in allocated memory. */
1163
1164
    cmd_buf = make_filter_cmd(cmd, itmp, otmp);
1164
1165
    if (cmd_buf == NULL)
1165
1166
        goto filterend;
1180
1181
    if (do_out)
1181
1182
    {
1182
1183
        if (u_save((linenr_T)(line2), (linenr_T)(line2 + 1)) == FAIL)
 
1184
        {
 
1185
            vim_free(cmd_buf);
1183
1186
            goto error;
 
1187
        }
1184
1188
        redraw_curbuf_later(VALID);
1185
1189
    }
1186
1190
    read_linecount = curbuf->b_ml.ml_line_count;
4471
4475
            /*
4472
4476
             * The new text is build up step by step, to avoid too much
4473
4477
             * copying.  There are these pieces:
4474
 
             * sub_firstline    The old text, unmodifed.
 
4478
             * sub_firstline    The old text, unmodified.
4475
4479
             * copycol          Column in the old text where we started
4476
4480
             *                  looking for a match; from here old text still
4477
4481
             *                  needs to be copied to the new text.