7.3.683

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.683
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.683
  11 Problem:    ":python" may crash when vimbindeval() returns None.
  12 Solution:   Check for v_string to be NULL. (Yukihiro Nakadaira)
  13 Files:      src/if_py_both.h
  14
  15
  16 *** ../vim-7.3.682/src/if_py_both.h     2012-09-21 14:00:05.000000000 +0200
  17 --- src/if_py_both.h    2012-10-05 21:05:06.000000000 +0200
  18 ***************
  19 *** 351,357 ****
  20
  21       if (our_tv->v_type == VAR_STRING)
  22       {
  23 !       result = Py_BuildValue("s", our_tv->vval.v_string);
  24       }
  25       else if (our_tv->v_type == VAR_NUMBER)
  26       {
  27 --- 351,358 ----
  28
  29       if (our_tv->v_type == VAR_STRING)
  30       {
  31 !       result = Py_BuildValue("s", our_tv->vval.v_string == NULL
  32 !                                       ? "" : (char *)our_tv->vval.v_string);
  33       }
  34       else if (our_tv->v_type == VAR_NUMBER)
  35       {
  36 ***************
  37 *** 2751,2757 ****
  38       switch (tv->v_type)
  39       {
  40         case VAR_STRING:
  41 !           return PyBytes_FromString((char *) tv->vval.v_string);
  42         case VAR_NUMBER:
  43             return PyLong_FromLong((long) tv->vval.v_number);
  44   #ifdef FEAT_FLOAT
  45 --- 2752,2759 ----
  46       switch (tv->v_type)
  47       {
  48         case VAR_STRING:
  49 !           return PyBytes_FromString(tv->vval.v_string == NULL
  50 !                                           ? "" : (char *)tv->vval.v_string);
  51         case VAR_NUMBER:
  52             return PyLong_FromLong((long) tv->vval.v_number);
  53   #ifdef FEAT_FLOAT
  54 ***************
  55 *** 2763,2769 ****
  56         case VAR_DICT:
  57             return DictionaryNew(tv->vval.v_dict);
  58         case VAR_FUNC:
  59 !           return FunctionNew(tv->vval.v_string);
  60         case VAR_UNKNOWN:
  61             Py_INCREF(Py_None);
  62             return Py_None;
  63 --- 2765,2772 ----
  64         case VAR_DICT:
  65             return DictionaryNew(tv->vval.v_dict);
  66         case VAR_FUNC:
  67 !           return FunctionNew(tv->vval.v_string == NULL
  68 !                                         ? (char_u *)"" : tv->vval.v_string);
  69         case VAR_UNKNOWN:
  70             Py_INCREF(Py_None);
  71             return Py_None;
  72 *** ../vim-7.3.682/src/version.c        2012-10-04 22:38:32.000000000 +0200
  73 --- src/version.c       2012-10-05 21:04:19.000000000 +0200
  74 ***************
  75 *** 721,722 ****
  76 --- 721,724 ----
  77   {   /* Add new patch number below this line */
  78 + /**/
  79 +     683,
  80   /**/
  81
  82 --
  83 SIGIRO -- irony detected (iron core dumped)
  84
  85  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  86 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  87 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  88  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///