#17873 BUG: numpy.putmask respecting writeable flag

                self);
        return -1;
    }
    if ((flags & PyBUF_WRITEABLE) == PyBUF_WRITEABLE) {
        PyErr_SetString(PyExc_BufferError, "scalar buffer is readonly");
        return -1;
    }
    PyArray_Descr *descr = PyArray_DescrFromScalar(self);
    if (descr == NULL) {
        return -1;

@@ -2413,6 +2417,7 @@

    view->shape = NULL;
    view->strides = NULL;
    view->suboffsets = NULL;
    view->readonly = 1;  /* assume general (user) scalars are readonly. */
    Py_INCREF(self);
    view->obj = self;
    view->buf = scalar_value(self, descr);

@@ -2444,6 +2449,7 @@

@name@_getbuffer(PyObject *self, Py_buffer *view, int flags)
{
    if ((flags & PyBUF_WRITEABLE) == PyBUF_WRITEABLE) {
        PyErr_SetString(PyExc_BufferError, "scalar buffer is readonly");
        return -1;
    }
    Py@Name@ScalarObject *scalar = (Py@Name@ScalarObject *)self;

@@ -2456,6 +2462,7 @@

    view->shape = NULL;
    view->strides = NULL;
    view->suboffsets = NULL;
    view->readonly = 1;
    Py_INCREF(self);
    view->obj = self;
    view->buf = &(scalar->obval);

@@ -2482,6 +2489,7 @@

unicode_getbuffer(PyObject *self, Py_buffer *view, int flags)
{
    if ((flags & PyBUF_WRITEABLE) == PyBUF_WRITEABLE) {
        PyErr_SetString(PyExc_BufferError, "scalar buffer is readonly");
        return -1;
    }
    PyUnicodeScalarObject *scalar = (PyUnicodeScalarObject *)self;

@@ -2493,6 +2501,7 @@

    view->shape = NULL;
    view->strides = NULL;
    view->suboffsets = NULL;
    view->readonly = 1;
    Py_INCREF(self);
    view->obj = self;


@@ -2522,7 +2531,7 @@

        view->format = scalar->buffer_fmt;
    }
    else {
        scalar->buffer_fmt = PyObject_Malloc(22);
        scalar->buffer_fmt = PyMem_Malloc(22);
        if (scalar->buffer_fmt == NULL) {
            Py_SETREF(view->obj, NULL);
            return -1;

@@ -2549,6 +2558,7 @@

@name@_getbuffer(PyObject *self, Py_buffer *view, int flags)
{
    if ((flags & PyBUF_WRITEABLE) == PyBUF_WRITEABLE) {
        PyErr_SetString(PyExc_BufferError, "scalar buffer is readonly");
        return -1;
    }
    Py@Name@ScalarObject *scalar = (Py@Name@ScalarObject *)self;

@@ -2560,6 +2570,7 @@

    view->shape = &length;
    view->strides = NULL;
    view->suboffsets = NULL;
    view->readonly = 1;
    Py_INCREF(self);
    view->obj = self;


@@ -2651,6 +2662,7 @@

{
    /* note: may be null if it was never requested */
    PyMem_Free(PyArrayScalar_VAL(v, Unicode));
    PyMem_Free(((PyUnicodeScalarObject *)v)->buffer_fmt);
    /* delegate to the base class */
    PyUnicode_Type.tp_dealloc(v);
}

@@ -576,6 +576,10 @@

        return NULL;
    }

    if (PyArray_FailUnlessWriteable(self, "putmask: output array") < 0) {
        return NULL;
    }

    mask = (PyArrayObject *)PyArray_FROM_OTF(mask0, NPY_BOOL,
                                NPY_ARRAY_CARRAY | NPY_ARRAY_FORCECAST);
    if (mask == NULL) {

@@ -3194,9 +3194,10 @@

    }

    PyObject *shape2 = convert_shape_to_string(mit->nd, mit->dimensions, "");
    if (shape2 == NULL)
    if (shape2 == NULL) {
        Py_DECREF(shape1);
        goto finish;
    }

    PyErr_Format(PyExc_ValueError,
            "shape mismatch: value array of shape %S could not be broadcast "

@@ -677,11 +677,12 @@

                "invalid error argument to test function.");
    }
    if (PyArray_RegisterDataType(dtype) < 0) {
        /* Fix original type in the error_path == 2 case. */
        /* Fix original type in the error_path == 2 case and delete it */
        Py_SET_TYPE(dtype, original_type);
        Py_DECREF(dtype);
        return NULL;
    }
    Py_INCREF(dtype);
    Py_INCREF(dtype);  /* hold on to the original (leaks a reference) */
    return (PyObject *)dtype;
}


Learn more Showing 14 files with coverage changes found.

Changes in numpy/core/src/multiarray/mapping.c

→

Loading file...

Changes in numpy/core/src/umath/ufunc_object.c

-1

→

Loading file...

Changes in numpy/core/src/multiarray/_multiarray_tests.c.src

-1

→

Loading file...

Changes in numpy/core/src/multiarray/buffer.c

-2

→

Loading file...

Changes in numpy/core/src/umath/loops.c.src

-39

→

+39

Loading file...

Changes in numpy/core/src/common/npy_cpu_features.c.src

-26

→

+26

Loading file...

Changes in numpy/core/src/umath/simd.inc.src

-264

→

+264

Loading file...

Changes in numpy/core/src/_simd/_simd_vector.inc

-29

→

+29

Loading file...

Changes in numpy/core/src/common/simd/avx512/misc.h

-9

→

Loading file...

Changes in numpy/core/src/common/simd/avx512/memory.h

-62

→

+62

Loading file...

Changes in numpy/core/src/common/simd/avx512/math.h

-6

→

Loading file...

Changes in numpy/core/src/common/simd/avx512/reorder.h

-39

→

+39

Loading file...

Changes in numpy/core/src/common/simd/avx512/arithmetic.h

-18

→

+18

Loading file...

Changes in numpy/core/src/common/simd/avx512/operators.h

-17

→

+17

Loading file...

83.75% 100.00% ø

updated code with suggestions

a-elhag

#17873 1652a17

CI Passed

Hiding 3 contexual commits

+511

-510

82.64% ø -1.11%

Merge pull request #17883 from jakobjakobson13/delete_duplicate

mattip

d3cffdc

CI Passed

-510

+510

2061a7b

+510

-510

82.64% ø -1.38%

Merge pull request #17881 from numpy/dependabot/pip/hypothesis-5.41.4

Unknown

ada9441

CI Passed

-632

+632

84.02% ø +0.27%

MAINT: Bump hypothesis from 5.41.3 to 5.41.4

Unknown

7432908

CI Passed

+122

-122

83.75% 100.00% +1.12%

Merge pull request #17877 from seberg/fixup-buffer-and-bracket

charris

c924809

CI Passed

-2

83.76% 100.00% +0.02%

BUG: Fix readonly related scalar buffer exports

seberg

a846494

CI Passed

Hiding 2 contexual commits

+16

+21

-5

83.74% ø ø

moved test to its approp. location

a-elhag

#17873 9f17656

CI Passed

83.74% 100.00% +1.11%

BUG: numpy.putmask respecting writeable flag

a-elhag

#17873 67b21e6

CI Passed

+511

-510

Pull Request Base Commit

82.63% ø ø

Merge pull request #17872 from rgommers/doc-oldestsupportednumpy

charris

76930e7

CI Passed

Files		•	•	•	Coverage
numpy	+18	+531	ø	-513	^+1.12% 83.75%
Project Totals (157 files)	45,891	38,436	0	7,455	83.75%

2395	2395		self);
2396	2396		return -1;
2397	2397		}
	2398	+	if ((flags & PyBUF_WRITEABLE) == PyBUF_WRITEABLE) {
	2399	+	PyErr_SetString(PyExc_BufferError, "scalar buffer is readonly");
	2400	+	return -1;
	2401	+	}
2398	2402		PyArray_Descr *descr = PyArray_DescrFromScalar(self);
2399	2403		if (descr == NULL) {
2400	2404		return -1;

2444	2449		@name@_getbuffer(PyObject self, Py_buffer view, int flags)
2445	2450		{
2446	2451		if ((flags & PyBUF_WRITEABLE) == PyBUF_WRITEABLE) {
	2452	+	PyErr_SetString(PyExc_BufferError, "scalar buffer is readonly");
2447	2453		return -1;
2448	2454		}
2449	2455		Py@Name@ScalarObject scalar = (Py@Name@ScalarObject )self;

2456	2462		view->shape = NULL;
2457	2463		view->strides = NULL;
2458	2464		view->suboffsets = NULL;
	2465	+	view->readonly = 1;
2459	2466		Py_INCREF(self);
2460	2467		view->obj = self;
2461	2468		view->buf = &(scalar->obval);

2482	2489		unicode_getbuffer(PyObject self, Py_buffer view, int flags)
2483	2490		{
2484	2491		if ((flags & PyBUF_WRITEABLE) == PyBUF_WRITEABLE) {
	2492	+	PyErr_SetString(PyExc_BufferError, "scalar buffer is readonly");
2485	2493		return -1;
2486	2494		}
2487	2495		PyUnicodeScalarObject scalar = (PyUnicodeScalarObject )self;

2493	2501		view->shape = NULL;
2494	2502		view->strides = NULL;
2495	2503		view->suboffsets = NULL;
	2504	+	view->readonly = 1;
2496	2505		Py_INCREF(self);
2497	2506		view->obj = self;
2498	2507

#17873 BUG: numpy.putmask respecting writeable flag

No flags found

Show failed CI and contexual commits `c`

14 Commits

2413	2417		view->shape = NULL;
2414	2418		view->strides = NULL;
2415	2419		view->suboffsets = NULL;
	2420	+	view->readonly = 1; /* assume general (user) scalars are readonly. */
2416	2421		Py_INCREF(self);
2417	2422		view->obj = self;
2418	2423		view->buf = scalar_value(self, descr);

2522	2531		view->format = scalar->buffer_fmt;
2523	2532		}
2524	2533		else {
2525		-	scalar->buffer_fmt = PyObject_Malloc(22);
	2534	+	scalar->buffer_fmt = PyMem_Malloc(22);
2526	2535		if (scalar->buffer_fmt == NULL) {
2527	2536		Py_SETREF(view->obj, NULL);
2528	2537		return -1;

2549	2558		@name@_getbuffer(PyObject self, Py_buffer view, int flags)
2550	2559		{
2551	2560		if ((flags & PyBUF_WRITEABLE) == PyBUF_WRITEABLE) {
	2561	+	PyErr_SetString(PyExc_BufferError, "scalar buffer is readonly");
2552	2562		return -1;
2553	2563		}
2554	2564		Py@Name@ScalarObject scalar = (Py@Name@ScalarObject )self;

2560	2570		view->shape = &length;
2561	2571		view->strides = NULL;
2562	2572		view->suboffsets = NULL;
	2573	+	view->readonly = 1;
2563	2574		Py_INCREF(self);
2564	2575		view->obj = self;
2565	2576

2651	2662		{
2652	2663		/* note: may be null if it was never requested */
2653	2664		PyMem_Free(PyArrayScalar_VAL(v, Unicode));
	2665	+	PyMem_Free(((PyUnicodeScalarObject *)v)->buffer_fmt);
2654	2666		/* delegate to the base class */
2655	2667		PyUnicode_Type.tp_dealloc(v);
2656	2668		}

576	576		return NULL;
577	577		}
578	578
	579	+	if (PyArray_FailUnlessWriteable(self, "putmask: output array") < 0) {
	580	+	return NULL;
	581	+	}
	582	+
579	583		mask = (PyArrayObject *)PyArray_FROM_OTF(mask0, NPY_BOOL,
580	584		NPY_ARRAY_CARRAY \| NPY_ARRAY_FORCECAST);
581	585		if (mask == NULL) {

3194	3194		}
3195	3195
3196	3196		PyObject *shape2 = convert_shape_to_string(mit->nd, mit->dimensions, "");
3197		-	if (shape2 == NULL)
	3197	+	if (shape2 == NULL) {
3198	3198		Py_DECREF(shape1);
3199	3199		goto finish;
	3200	+	}
3200	3201
3201	3202		PyErr_Format(PyExc_ValueError,
3202	3203		"shape mismatch: value array of shape %S could not be broadcast "

677	677		"invalid error argument to test function.");
678	678		}
679	679		if (PyArray_RegisterDataType(dtype) < 0) {
680		-	/* Fix original type in the error_path == 2 case. */
	680	+	/* Fix original type in the error_path == 2 case and delete it */
681	681		Py_SET_TYPE(dtype, original_type);
	682	+	Py_DECREF(dtype);
682	683		return NULL;
683	684		}
684		-	Py_INCREF(dtype);
	685	+	Py_INCREF(dtype); /* hold on to the original (leaks a reference) */
685	686		return (PyObject *)dtype;
686	687		}
687	688

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

#17873 BUG: numpy.putmask respecting writeable flag

No flags found

Show failed CI and contexual commits c 14 Commits

Show failed CI and contexual commits `c`

14 Commits