Skip to content

Commit

Permalink
Merge pull request #76 from conda/calloc-signature
Browse files Browse the repository at this point in the history
Calloc Signature & 0.6.6 Release
  • Loading branch information
dholth authored Oct 3, 2023
2 parents 2695ce3 + e8ff17f commit 38bbc0e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
- name: Ken Odegard
email: [email protected]
github: kenodegard
num_commits: 5
num_commits: 9
first_commit: 2022-06-15 14:15:32
- name: Daniel Holth
email: [email protected]
github: dholth
num_commits: 7
num_commits: 9
first_commit: 2022-10-14 14:44:28
- name: Ilan Schnell
email: [email protected]
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
[//]: # (current developments)

## 0.6.6 (2023-10-03)

### Bug fixes

* Fix `PyMem_Calloc()` call signature. (#76)

### Contributors

* @dholth
* @kenodegard



## 0.6.5 (2023-10-02)

### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include \
setup.h CHANGELOG CODE_OF_CONDUCT.md HOW_WE_USE_GITHUB.md LICENSE \
setup.h CHANGELOG.md CODE_OF_CONDUCT.md HOW_WE_USE_GITHUB.md LICENSE \
Makefile README.rst picosat.c picosat.h pycosat.c test_pycosat.py
graft examples/
4 changes: 2 additions & 2 deletions pycosat.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
uses an MIT style license.
*/
#define PYCOSAT_URL "https://pypi.python.org/pypi/pycosat"
#define PYCOSAT_VERSION "0.6.5"
#define PYCOSAT_VERSION "0.6.6"

#include <Python.h>

Expand Down Expand Up @@ -271,7 +271,7 @@ static PyObject* itersolve(PyObject *self, PyObject *args, PyObject *kwds)
if (it->picosat == NULL)
return NULL;

it->mem = PyMem_Calloc(picosat_variables(it->picosat) + 1);
it->mem = PyMem_Calloc(picosat_variables(it->picosat) + 1, 1);
if (it->mem == NULL) {
PyErr_NoMemory();
return NULL;
Expand Down

0 comments on commit 38bbc0e

Please sign in to comment.