|
 |
073263 |
To: vim_dev@googlegroups.com
|
|
|
073263 |
Subject: Patch 7.4.625
|
|
|
073263 |
Fcc: outbox
|
|
|
073263 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
073263 |
Mime-Version: 1.0
|
|
|
073263 |
Content-Type: text/plain; charset=UTF-8
|
|
|
073263 |
Content-Transfer-Encoding: 8bit
|
|
|
073263 |
------------
|
|
|
073263 |
|
|
|
073263 |
Patch 7.4.625
|
|
|
073263 |
Problem: Possible NULL pointer dereference.
|
|
|
073263 |
Solution: Check for NULL before using it. (Mike Williams)
|
|
|
073263 |
Files: src/if_py_both.h
|
|
|
073263 |
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.624/src/if_py_both.h 2015-02-03 12:55:11.136179596 +0100
|
|
|
073263 |
--- src/if_py_both.h 2015-02-10 18:39:40.531839555 +0100
|
|
|
073263 |
***************
|
|
|
073263 |
*** 747,758 ****
|
|
|
073263 |
else if (our_tv->v_type == VAR_DICT)
|
|
|
073263 |
{
|
|
|
073263 |
|
|
|
073263 |
! hashtab_T *ht = &our_tv->vval.v_dict->dv_hashtab;
|
|
|
073263 |
! long_u todo = ht->ht_used;
|
|
|
073263 |
hashitem_T *hi;
|
|
|
073263 |
dictitem_T *di;
|
|
|
073263 |
if (our_tv->vval.v_dict == NULL)
|
|
|
073263 |
return NULL;
|
|
|
073263 |
|
|
|
073263 |
if (!(ret = PyDict_New()))
|
|
|
073263 |
return NULL;
|
|
|
073263 |
--- 747,760 ----
|
|
|
073263 |
else if (our_tv->v_type == VAR_DICT)
|
|
|
073263 |
{
|
|
|
073263 |
|
|
|
073263 |
! hashtab_T *ht;
|
|
|
073263 |
! long_u todo;
|
|
|
073263 |
hashitem_T *hi;
|
|
|
073263 |
dictitem_T *di;
|
|
|
073263 |
+
|
|
|
073263 |
if (our_tv->vval.v_dict == NULL)
|
|
|
073263 |
return NULL;
|
|
|
073263 |
+ ht = &our_tv->vval.v_dict->dv_hashtab;
|
|
|
073263 |
|
|
|
073263 |
if (!(ret = PyDict_New()))
|
|
|
073263 |
return NULL;
|
|
|
073263 |
***************
|
|
|
073263 |
*** 763,768 ****
|
|
|
073263 |
--- 765,771 ----
|
|
|
073263 |
return NULL;
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
+ todo = ht->ht_used;
|
|
|
073263 |
for (hi = ht->ht_array; todo > 0; ++hi)
|
|
|
073263 |
{
|
|
|
073263 |
if (!HASHITEM_EMPTY(hi))
|
|
|
073263 |
*** ../vim-7.4.624/src/version.c 2015-02-10 18:33:53.240319951 +0100
|
|
|
073263 |
--- src/version.c 2015-02-10 18:38:37.364655345 +0100
|
|
|
073263 |
***************
|
|
|
073263 |
*** 743,744 ****
|
|
|
073263 |
--- 743,746 ----
|
|
|
073263 |
{ /* Add new patch number below this line */
|
|
|
073263 |
+ /**/
|
|
|
073263 |
+ 625,
|
|
|
073263 |
/**/
|
|
|
073263 |
|
|
|
073263 |
--
|
|
|
073263 |
hundred-and-one symptoms of being an internet addict:
|
|
|
073263 |
212. Your Internet group window has more icons than your Accessories window.
|
|
|
073263 |
|
|
|
073263 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
073263 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
073263 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
073263 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|