diff options
| author | Julian Taylor <juliantaylor108@gmail.com> | 2014-08-28 11:30:05 +0200 |
|---|---|---|
| committer | Julian Taylor <juliantaylor108@gmail.com> | 2014-08-28 11:30:05 +0200 |
| commit | 791a719109cbbd9c23048f9fb8b0ff91d4dc122c (patch) | |
| tree | 613bf9d0266d06728b7d553c0682009cd834c371 | |
| parent | 036efee0caf0bf026a9e8a9fd2010be11c7d9408 (diff) | |
| parent | 9e93c073fd949566f96561047112e052616be504 (diff) | |
| download | numpy-791a719109cbbd9c23048f9fb8b0ff91d4dc122c.tar.gz | |
Merge pull request #5013 from larsmans/c-fixes
Small fixes, including a memset(NULL, c, n)
| -rw-r--r-- | numpy/core/src/multiarray/alloc.c | 4 | ||||
| -rw-r--r-- | numpy/linalg/lapack_lite/python_xerbla.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/alloc.c b/numpy/core/src/multiarray/alloc.c index 06c9ff296..fad153eec 100644 --- a/numpy/core/src/multiarray/alloc.c +++ b/numpy/core/src/multiarray/alloc.c @@ -76,7 +76,9 @@ npy_alloc_cache_zero(npy_uintp sz) NPY_BEGIN_THREADS_DEF; if (sz < NBUCKETS) { p = _npy_alloc_cache(sz, 1, NBUCKETS, datacache, &PyDataMem_NEW); - memset(p, 0, sz); + if (p) { + memset(p, 0, sz); + } return p; } NPY_BEGIN_THREADS; diff --git a/numpy/linalg/lapack_lite/python_xerbla.c b/numpy/linalg/lapack_lite/python_xerbla.c index 2296cc53f..c4d2e484e 100644 --- a/numpy/linalg/lapack_lite/python_xerbla.c +++ b/numpy/linalg/lapack_lite/python_xerbla.c @@ -20,10 +20,9 @@ int xerbla_(char *srname, integer *info) { - const char* format = "On entry to %.*s" \ + static const char format[] = "On entry to %.*s" \ " parameter number %d had an illegal value"; - char buf[57 + 6 + 4]; /* 57 for strlen(format), - 6 for name, 4 for param. num. */ + char buf[sizeof(format) + 6 + 4]; /* 6 for name, 4 for param. num. */ int len = 0; /* length of subroutine name*/ #ifdef WITH_THREAD |