home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.1041 < prev    next >
Encoding:
Internet Message Format  |  2013-05-28  |  3.9 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.1041
  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.1041
  11. Problem:    Python: Invalid read valgrind errors.
  12. Solution:   Python patch 2: defer DICTKEY_UNREF until key is no longer needed.
  13.         (ZyX)
  14. Files:        src/if_py_both.h
  15.  
  16.  
  17. *** ../vim-7.3.1040/src/if_py_both.h    2013-05-28 22:31:43.000000000 +0200
  18. --- src/if_py_both.h    2013-05-29 21:36:29.000000000 +0200
  19. ***************
  20. *** 1603,1613 ****
  21.       flags = get_option_value_strict(key, NULL, NULL,
  22.                       self->opt_type, self->from);
  23.   
  24. -     DICTKEY_UNREF
  25. - 
  26.       if (flags == 0)
  27.       {
  28.       PyErr_SetObject(PyExc_KeyError, keyObject);
  29.       return -1;
  30.       }
  31.   
  32. --- 1603,1612 ----
  33.       flags = get_option_value_strict(key, NULL, NULL,
  34.                       self->opt_type, self->from);
  35.   
  36.       if (flags == 0)
  37.       {
  38.       PyErr_SetObject(PyExc_KeyError, keyObject);
  39. +     DICTKEY_UNREF
  40.       return -1;
  41.       }
  42.   
  43. ***************
  44. *** 1617,1633 ****
  45. --- 1616,1635 ----
  46.       {
  47.           PyErr_SetString(PyExc_ValueError,
  48.               _("unable to unset global option"));
  49. +         DICTKEY_UNREF
  50.           return -1;
  51.       }
  52.       else if (!(flags & SOPT_GLOBAL))
  53.       {
  54.           PyErr_SetString(PyExc_ValueError, _("unable to unset option "
  55.                           "without global value"));
  56. +         DICTKEY_UNREF
  57.           return -1;
  58.       }
  59.       else
  60.       {
  61.           unset_global_local_option(key, self->from);
  62. +         DICTKEY_UNREF
  63.           return 0;
  64.       }
  65.       }
  66. ***************
  67. *** 1639,1647 ****
  68.       int    istrue = PyObject_IsTrue(valObject);
  69.   
  70.       if (istrue == -1)
  71. !         return -1;
  72. !     r = set_option_value_for(key, istrue, NULL,
  73. !                 opt_flags, self->opt_type, self->from);
  74.       }
  75.       else if (flags & SOPT_NUM)
  76.       {
  77. --- 1641,1650 ----
  78.       int    istrue = PyObject_IsTrue(valObject);
  79.   
  80.       if (istrue == -1)
  81. !         r = -1;
  82. !     else
  83. !         r = set_option_value_for(key, istrue, NULL,
  84. !                     opt_flags, self->opt_type, self->from);
  85.       }
  86.       else if (flags & SOPT_NUM)
  87.       {
  88. ***************
  89. *** 1657,1662 ****
  90. --- 1660,1666 ----
  91.       else
  92.       {
  93.           PyErr_SetString(PyExc_TypeError, _("object must be integer"));
  94. +         DICTKEY_UNREF
  95.           return -1;
  96.       }
  97.   
  98. ***************
  99. *** 1670,1678 ****
  100. --- 1674,1688 ----
  101.       {
  102.   
  103.           if (PyString_AsStringAndSize(valObject, (char **) &val, NULL) == -1)
  104. +         {
  105. +         DICTKEY_UNREF
  106.           return -1;
  107. +         }
  108.           if (val == NULL)
  109. +         {
  110. +         DICTKEY_UNREF
  111.           return -1;
  112. +         }
  113.   
  114.           val = vim_strsave(val);
  115.       }
  116. ***************
  117. *** 1682,1693 ****
  118. --- 1692,1712 ----
  119.   
  120.           bytes = PyUnicode_AsEncodedString(valObject, (char *)ENC_OPT, NULL);
  121.           if (bytes == NULL)
  122. +         {
  123. +         DICTKEY_UNREF
  124.           return -1;
  125. +         }
  126.   
  127.           if(PyString_AsStringAndSize(bytes, (char **) &val, NULL) == -1)
  128. +         {
  129. +         DICTKEY_UNREF
  130.           return -1;
  131. +         }
  132.           if (val == NULL)
  133. +         {
  134. +         DICTKEY_UNREF
  135.           return -1;
  136. +         }
  137.   
  138.           val = vim_strsave(val);
  139.           Py_XDECREF(bytes);
  140. ***************
  141. *** 1695,1700 ****
  142. --- 1714,1720 ----
  143.       else
  144.       {
  145.           PyErr_SetString(PyExc_TypeError, _("object must be string"));
  146. +         DICTKEY_UNREF
  147.           return -1;
  148.       }
  149.   
  150. ***************
  151. *** 1703,1708 ****
  152. --- 1723,1730 ----
  153.       vim_free(val);
  154.       }
  155.   
  156. +     DICTKEY_UNREF
  157. + 
  158.       return r;
  159.   }
  160.   
  161. *** ../vim-7.3.1040/src/version.c    2013-05-29 21:33:34.000000000 +0200
  162. --- src/version.c    2013-05-29 21:36:47.000000000 +0200
  163. ***************
  164. *** 730,731 ****
  165. --- 730,733 ----
  166.   {   /* Add new patch number below this line */
  167. + /**/
  168. +     1041,
  169.   /**/
  170.  
  171. -- 
  172. hundred-and-one symptoms of being an internet addict:
  173. 18. Your wife drapes a blond wig over your monitor to remind you of what she
  174.     looks like.
  175.  
  176.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  177. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  178. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  179.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  180.