mirror of
https://github.com/python/cpython.git
synced 2025-10-26 19:24:34 +00:00
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
1822 lines
41 KiB
C
1822 lines
41 KiB
C
/* struct module -- pack values into and (out of) strings */
|
|
|
|
/* New version supporting byte order, alignment and size options,
|
|
character strings, and unsigned numbers */
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
|
|
#include "Python.h"
|
|
#include "structseq.h"
|
|
#include "structmember.h"
|
|
#include <ctype.h>
|
|
|
|
static PyTypeObject PyStructType;
|
|
|
|
/* compatibility macros */
|
|
#if (PY_VERSION_HEX < 0x02050000)
|
|
typedef int Py_ssize_t;
|
|
#endif
|
|
|
|
/* If PY_STRUCT_OVERFLOW_MASKING is defined, the struct module will wrap all input
|
|
numbers for explicit endians such that they fit in the given type, much
|
|
like explicit casting in C. A warning will be raised if the number did
|
|
not originally fit within the range of the requested type. If it is
|
|
not defined, then all range errors and overflow will be struct.error
|
|
exceptions. */
|
|
|
|
#define PY_STRUCT_OVERFLOW_MASKING 1
|
|
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
static PyObject *pylong_ulong_mask = NULL;
|
|
static PyObject *pyint_zero = NULL;
|
|
#endif
|
|
|
|
/* The translation function for each format character is table driven */
|
|
typedef struct _formatdef {
|
|
char format;
|
|
Py_ssize_t size;
|
|
Py_ssize_t alignment;
|
|
PyObject* (*unpack)(const char *,
|
|
const struct _formatdef *);
|
|
int (*pack)(char *, PyObject *,
|
|
const struct _formatdef *);
|
|
} formatdef;
|
|
|
|
typedef struct _formatcode {
|
|
const struct _formatdef *fmtdef;
|
|
Py_ssize_t offset;
|
|
Py_ssize_t size;
|
|
} formatcode;
|
|
|
|
/* Struct object interface */
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
Py_ssize_t s_size;
|
|
Py_ssize_t s_len;
|
|
formatcode *s_codes;
|
|
PyObject *s_format;
|
|
PyObject *weakreflist; /* List of weak references */
|
|
} PyStructObject;
|
|
|
|
|
|
#define PyStruct_Check(op) PyObject_TypeCheck(op, &PyStructType)
|
|
#define PyStruct_CheckExact(op) ((op)->ob_type == &PyStructType)
|
|
|
|
|
|
/* Exception */
|
|
|
|
static PyObject *StructError;
|
|
|
|
|
|
/* Define various structs to figure out the alignments of types */
|
|
|
|
|
|
typedef struct { char c; short x; } st_short;
|
|
typedef struct { char c; int x; } st_int;
|
|
typedef struct { char c; long x; } st_long;
|
|
typedef struct { char c; float x; } st_float;
|
|
typedef struct { char c; double x; } st_double;
|
|
typedef struct { char c; void *x; } st_void_p;
|
|
|
|
#define SHORT_ALIGN (sizeof(st_short) - sizeof(short))
|
|
#define INT_ALIGN (sizeof(st_int) - sizeof(int))
|
|
#define LONG_ALIGN (sizeof(st_long) - sizeof(long))
|
|
#define FLOAT_ALIGN (sizeof(st_float) - sizeof(float))
|
|
#define DOUBLE_ALIGN (sizeof(st_double) - sizeof(double))
|
|
#define VOID_P_ALIGN (sizeof(st_void_p) - sizeof(void *))
|
|
|
|
/* We can't support q and Q in native mode unless the compiler does;
|
|
in std mode, they're 8 bytes on all platforms. */
|
|
#ifdef HAVE_LONG_LONG
|
|
typedef struct { char c; PY_LONG_LONG x; } s_long_long;
|
|
#define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(PY_LONG_LONG))
|
|
#endif
|
|
|
|
#define STRINGIFY(x) #x
|
|
|
|
#ifdef __powerc
|
|
#pragma options align=reset
|
|
#endif
|
|
|
|
/* Helper to get a PyLongObject by hook or by crook. Caller should decref. */
|
|
|
|
static PyObject *
|
|
get_pylong(PyObject *v)
|
|
{
|
|
PyNumberMethods *m;
|
|
|
|
assert(v != NULL);
|
|
if (PyInt_Check(v))
|
|
return PyLong_FromLong(PyInt_AS_LONG(v));
|
|
if (PyLong_Check(v)) {
|
|
Py_INCREF(v);
|
|
return v;
|
|
}
|
|
m = v->ob_type->tp_as_number;
|
|
if (m != NULL && m->nb_long != NULL) {
|
|
v = m->nb_long(v);
|
|
if (v == NULL)
|
|
return NULL;
|
|
if (PyLong_Check(v))
|
|
return v;
|
|
Py_DECREF(v);
|
|
}
|
|
PyErr_SetString(StructError,
|
|
"cannot convert argument to long");
|
|
return NULL;
|
|
}
|
|
|
|
/* Helper routine to get a Python integer and raise the appropriate error
|
|
if it isn't one */
|
|
|
|
static int
|
|
get_long(PyObject *v, long *p)
|
|
{
|
|
long x = PyInt_AsLong(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
if (PyErr_ExceptionMatches(PyExc_TypeError))
|
|
PyErr_SetString(StructError,
|
|
"required argument is not an integer");
|
|
return -1;
|
|
}
|
|
*p = x;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Same, but handling unsigned long */
|
|
|
|
static int
|
|
get_ulong(PyObject *v, unsigned long *p)
|
|
{
|
|
if (PyLong_Check(v)) {
|
|
unsigned long x = PyLong_AsUnsignedLong(v);
|
|
if (x == (unsigned long)(-1) && PyErr_Occurred())
|
|
return -1;
|
|
*p = x;
|
|
return 0;
|
|
}
|
|
if (get_long(v, (long *)p) < 0)
|
|
return -1;
|
|
if (((long)*p) < 0) {
|
|
PyErr_SetString(StructError,
|
|
"unsigned argument is < 0");
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
/* Same, but handling native long long. */
|
|
|
|
static int
|
|
get_longlong(PyObject *v, PY_LONG_LONG *p)
|
|
{
|
|
PY_LONG_LONG x;
|
|
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
assert(PyLong_Check(v));
|
|
x = PyLong_AsLongLong(v);
|
|
Py_DECREF(v);
|
|
if (x == (PY_LONG_LONG)-1 && PyErr_Occurred())
|
|
return -1;
|
|
*p = x;
|
|
return 0;
|
|
}
|
|
|
|
/* Same, but handling native unsigned long long. */
|
|
|
|
static int
|
|
get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p)
|
|
{
|
|
unsigned PY_LONG_LONG x;
|
|
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
assert(PyLong_Check(v));
|
|
x = PyLong_AsUnsignedLongLong(v);
|
|
Py_DECREF(v);
|
|
if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())
|
|
return -1;
|
|
*p = x;
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
|
|
/* Helper routine to get a Python integer and raise the appropriate error
|
|
if it isn't one */
|
|
|
|
static int
|
|
get_wrapped_long(PyObject *v, long *p)
|
|
{
|
|
if (get_long(v, p) < 0) {
|
|
if (PyLong_Check(v) && PyErr_ExceptionMatches(PyExc_OverflowError)) {
|
|
PyObject *wrapped;
|
|
long x;
|
|
PyErr_Clear();
|
|
if (PyErr_Warn(PyExc_DeprecationWarning, "struct integer overflow masking is deprecated") < 0)
|
|
return -1;
|
|
wrapped = PyNumber_And(v, pylong_ulong_mask);
|
|
if (wrapped == NULL)
|
|
return -1;
|
|
x = (long)PyLong_AsUnsignedLong(wrapped);
|
|
Py_DECREF(wrapped);
|
|
if (x == -1 && PyErr_Occurred())
|
|
return -1;
|
|
*p = x;
|
|
} else {
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
get_wrapped_ulong(PyObject *v, unsigned long *p)
|
|
{
|
|
long x = (long)PyLong_AsUnsignedLong(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyObject *wrapped;
|
|
PyErr_Clear();
|
|
wrapped = PyNumber_And(v, pylong_ulong_mask);
|
|
if (wrapped == NULL)
|
|
return -1;
|
|
if (PyErr_Warn(PyExc_DeprecationWarning, "struct integer overflow masking is deprecated") < 0) {
|
|
Py_DECREF(wrapped);
|
|
return -1;
|
|
}
|
|
x = (long)PyLong_AsUnsignedLong(wrapped);
|
|
Py_DECREF(wrapped);
|
|
if (x == -1 && PyErr_Occurred())
|
|
return -1;
|
|
}
|
|
*p = (unsigned long)x;
|
|
return 0;
|
|
}
|
|
|
|
#define RANGE_ERROR(x, f, flag, mask) \
|
|
do { \
|
|
if (_range_error(f, flag) < 0) \
|
|
return -1; \
|
|
else \
|
|
(x) &= (mask); \
|
|
} while (0)
|
|
|
|
#else
|
|
|
|
#define get_wrapped_long get_long
|
|
#define get_wrapped_ulong get_ulong
|
|
#define RANGE_ERROR(x, f, flag, mask) return _range_error(f, flag)
|
|
|
|
#endif
|
|
|
|
/* Floating point helpers */
|
|
|
|
static PyObject *
|
|
unpack_float(const char *p, /* start of 4-byte string */
|
|
int le) /* true for little-endian, false for big-endian */
|
|
{
|
|
double x;
|
|
|
|
x = _PyFloat_Unpack4((unsigned char *)p, le);
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
return NULL;
|
|
return PyFloat_FromDouble(x);
|
|
}
|
|
|
|
static PyObject *
|
|
unpack_double(const char *p, /* start of 8-byte string */
|
|
int le) /* true for little-endian, false for big-endian */
|
|
{
|
|
double x;
|
|
|
|
x = _PyFloat_Unpack8((unsigned char *)p, le);
|
|
if (x == -1.0 && PyErr_Occurred())
|
|
return NULL;
|
|
return PyFloat_FromDouble(x);
|
|
}
|
|
|
|
/* Helper to format the range error exceptions */
|
|
static int
|
|
_range_error(const formatdef *f, int is_unsigned)
|
|
{
|
|
/* ulargest is the largest unsigned value with f->size bytes.
|
|
* Note that the simpler:
|
|
* ((size_t)1 << (f->size * 8)) - 1
|
|
* doesn't work when f->size == sizeof(size_t) because C doesn't
|
|
* define what happens when a left shift count is >= the number of
|
|
* bits in the integer being shifted; e.g., on some boxes it doesn't
|
|
* shift at all when they're equal.
|
|
*/
|
|
const size_t ulargest = (size_t)-1 >> ((SIZEOF_SIZE_T - f->size)*8);
|
|
assert(f->size >= 1 && f->size <= SIZEOF_SIZE_T);
|
|
if (is_unsigned)
|
|
PyErr_Format(StructError,
|
|
"'%c' format requires 0 <= number <= %zu",
|
|
f->format,
|
|
ulargest);
|
|
else {
|
|
const Py_ssize_t largest = (Py_ssize_t)(ulargest >> 1);
|
|
PyErr_Format(StructError,
|
|
"'%c' format requires %zd <= number <= %zd",
|
|
f->format,
|
|
~ largest,
|
|
largest);
|
|
}
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
{
|
|
PyObject *ptype, *pvalue, *ptraceback;
|
|
PyObject *msg;
|
|
int rval;
|
|
PyErr_Fetch(&ptype, &pvalue, &ptraceback);
|
|
assert(pvalue != NULL);
|
|
msg = PyObject_Str(pvalue);
|
|
Py_XDECREF(ptype);
|
|
Py_XDECREF(pvalue);
|
|
Py_XDECREF(ptraceback);
|
|
if (msg == NULL)
|
|
return -1;
|
|
rval = PyErr_Warn(PyExc_DeprecationWarning,
|
|
PyString_AS_STRING(msg));
|
|
Py_DECREF(msg);
|
|
if (rval == 0)
|
|
return 0;
|
|
}
|
|
#endif
|
|
return -1;
|
|
}
|
|
|
|
|
|
|
|
/* A large number of small routines follow, with names of the form
|
|
|
|
[bln][up]_TYPE
|
|
|
|
[bln] distiguishes among big-endian, little-endian and native.
|
|
[pu] distiguishes between pack (to struct) and unpack (from struct).
|
|
TYPE is one of char, byte, ubyte, etc.
|
|
*/
|
|
|
|
/* Native mode routines. ****************************************************/
|
|
/* NOTE:
|
|
In all n[up]_<type> routines handling types larger than 1 byte, there is
|
|
*no* guarantee that the p pointer is properly aligned for each type,
|
|
therefore memcpy is called. An intermediate variable is used to
|
|
compensate for big-endian architectures.
|
|
Normally both the intermediate variable and the memcpy call will be
|
|
skipped by C optimisation in little-endian architectures (gcc >= 2.91
|
|
does this). */
|
|
|
|
static PyObject *
|
|
nu_char(const char *p, const formatdef *f)
|
|
{
|
|
return PyString_FromStringAndSize(p, 1);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_byte(const char *p, const formatdef *f)
|
|
{
|
|
return PyInt_FromLong((long) *(signed char *)p);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_ubyte(const char *p, const formatdef *f)
|
|
{
|
|
return PyInt_FromLong((long) *(unsigned char *)p);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_short(const char *p, const formatdef *f)
|
|
{
|
|
short x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyInt_FromLong((long)x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_ushort(const char *p, const formatdef *f)
|
|
{
|
|
unsigned short x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyInt_FromLong((long)x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_int(const char *p, const formatdef *f)
|
|
{
|
|
int x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyInt_FromLong((long)x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_uint(const char *p, const formatdef *f)
|
|
{
|
|
unsigned int x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
#if (SIZEOF_LONG > SIZEOF_INT)
|
|
return PyInt_FromLong((long)x);
|
|
#else
|
|
if (x <= ((unsigned int)LONG_MAX))
|
|
return PyInt_FromLong((long)x);
|
|
return PyLong_FromUnsignedLong((unsigned long)x);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
nu_long(const char *p, const formatdef *f)
|
|
{
|
|
long x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_ulong(const char *p, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong((long)x);
|
|
return PyLong_FromUnsignedLong(x);
|
|
}
|
|
|
|
/* Native mode doesn't support q or Q unless the platform C supports
|
|
long long (or, on Windows, __int64). */
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
static PyObject *
|
|
nu_longlong(const char *p, const formatdef *f)
|
|
{
|
|
PY_LONG_LONG x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
if (x >= LONG_MIN && x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
|
|
return PyLong_FromLongLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_ulonglong(const char *p, const formatdef *f)
|
|
{
|
|
unsigned PY_LONG_LONG x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
|
|
return PyLong_FromUnsignedLongLong(x);
|
|
}
|
|
|
|
#endif
|
|
|
|
static PyObject *
|
|
nu_float(const char *p, const formatdef *f)
|
|
{
|
|
float x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyFloat_FromDouble((double)x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_double(const char *p, const formatdef *f)
|
|
{
|
|
double x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyFloat_FromDouble(x);
|
|
}
|
|
|
|
static PyObject *
|
|
nu_void_p(const char *p, const formatdef *f)
|
|
{
|
|
void *x;
|
|
memcpy((char *)&x, p, sizeof x);
|
|
return PyLong_FromVoidPtr(x);
|
|
}
|
|
|
|
static int
|
|
np_byte(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
if (x < -128 || x > 127){
|
|
PyErr_SetString(StructError,
|
|
"byte format requires -128 <= number <= 127");
|
|
return -1;
|
|
}
|
|
*p = (char)x;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_ubyte(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
if (x < 0 || x > 255){
|
|
PyErr_SetString(StructError,
|
|
"ubyte format requires 0 <= number <= 255");
|
|
return -1;
|
|
}
|
|
*p = (char)x;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_char(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
if (!PyString_Check(v) || PyString_Size(v) != 1) {
|
|
PyErr_SetString(StructError,
|
|
"char format require string of length 1");
|
|
return -1;
|
|
}
|
|
*p = *PyString_AsString(v);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_short(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
short y;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
if (x < SHRT_MIN || x > SHRT_MAX){
|
|
PyErr_SetString(StructError,
|
|
"short format requires " STRINGIFY(SHRT_MIN)
|
|
" <= number <= " STRINGIFY(SHRT_MAX));
|
|
return -1;
|
|
}
|
|
y = (short)x;
|
|
memcpy(p, (char *)&y, sizeof y);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_ushort(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
unsigned short y;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
if (x < 0 || x > USHRT_MAX){
|
|
PyErr_SetString(StructError,
|
|
"short format requires 0 <= number <= " STRINGIFY(USHRT_MAX));
|
|
return -1;
|
|
}
|
|
y = (unsigned short)x;
|
|
memcpy(p, (char *)&y, sizeof y);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_int(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
int y;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
#if (SIZEOF_LONG > SIZEOF_INT)
|
|
if ((x < ((long)INT_MIN)) || (x > ((long)INT_MAX)))
|
|
return _range_error(f, 0);
|
|
#endif
|
|
y = (int)x;
|
|
memcpy(p, (char *)&y, sizeof y);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_uint(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
unsigned int y;
|
|
if (get_ulong(v, &x) < 0)
|
|
return _range_error(f, 1);
|
|
y = (unsigned int)x;
|
|
#if (SIZEOF_LONG > SIZEOF_INT)
|
|
if (x > ((unsigned long)UINT_MAX))
|
|
return _range_error(f, 1);
|
|
#endif
|
|
memcpy(p, (char *)&y, sizeof y);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_long(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
if (get_long(v, &x) < 0)
|
|
return -1;
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_ulong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
if (get_ulong(v, &x) < 0)
|
|
return _range_error(f, 1);
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef HAVE_LONG_LONG
|
|
|
|
static int
|
|
np_longlong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
PY_LONG_LONG x;
|
|
if (get_longlong(v, &x) < 0)
|
|
return -1;
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_ulonglong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned PY_LONG_LONG x;
|
|
if (get_ulonglong(v, &x) < 0)
|
|
return -1;
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static int
|
|
np_float(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
float x = (float)PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_double(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
memcpy(p, (char *)&x, sizeof(double));
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
np_void_p(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
void *x;
|
|
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
assert(PyLong_Check(v));
|
|
x = PyLong_AsVoidPtr(v);
|
|
Py_DECREF(v);
|
|
if (x == NULL && PyErr_Occurred())
|
|
return -1;
|
|
memcpy(p, (char *)&x, sizeof x);
|
|
return 0;
|
|
}
|
|
|
|
static formatdef native_table[] = {
|
|
{'x', sizeof(char), 0, NULL},
|
|
{'b', sizeof(char), 0, nu_byte, np_byte},
|
|
{'B', sizeof(char), 0, nu_ubyte, np_ubyte},
|
|
{'c', sizeof(char), 0, nu_char, np_char},
|
|
{'s', sizeof(char), 0, NULL},
|
|
{'p', sizeof(char), 0, NULL},
|
|
{'h', sizeof(short), SHORT_ALIGN, nu_short, np_short},
|
|
{'H', sizeof(short), SHORT_ALIGN, nu_ushort, np_ushort},
|
|
{'i', sizeof(int), INT_ALIGN, nu_int, np_int},
|
|
{'I', sizeof(int), INT_ALIGN, nu_uint, np_uint},
|
|
{'l', sizeof(long), LONG_ALIGN, nu_long, np_long},
|
|
{'L', sizeof(long), LONG_ALIGN, nu_ulong, np_ulong},
|
|
#ifdef HAVE_LONG_LONG
|
|
{'q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_longlong, np_longlong},
|
|
{'Q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_ulonglong,np_ulonglong},
|
|
#endif
|
|
{'f', sizeof(float), FLOAT_ALIGN, nu_float, np_float},
|
|
{'d', sizeof(double), DOUBLE_ALIGN, nu_double, np_double},
|
|
{'P', sizeof(void *), VOID_P_ALIGN, nu_void_p, np_void_p},
|
|
{0}
|
|
};
|
|
|
|
/* Big-endian routines. *****************************************************/
|
|
|
|
static PyObject *
|
|
bu_int(const char *p, const formatdef *f)
|
|
{
|
|
long x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | *bytes++;
|
|
} while (--i > 0);
|
|
/* Extend the sign bit. */
|
|
if (SIZEOF_LONG > f->size)
|
|
x |= -(x & (1L << ((8 * f->size) - 1)));
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
bu_uint(const char *p, const formatdef *f)
|
|
{
|
|
unsigned long x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | *bytes++;
|
|
} while (--i > 0);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong((long)x);
|
|
return PyLong_FromUnsignedLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
bu_longlong(const char *p, const formatdef *f)
|
|
{
|
|
#ifdef HAVE_LONG_LONG
|
|
PY_LONG_LONG x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | *bytes++;
|
|
} while (--i > 0);
|
|
/* Extend the sign bit. */
|
|
if (SIZEOF_LONG_LONG > f->size)
|
|
x |= -(x & (1L << ((8 * f->size) - 1)));
|
|
if (x >= LONG_MIN && x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
|
|
return PyLong_FromLongLong(x);
|
|
#else
|
|
return _PyLong_FromByteArray((const unsigned char *)p,
|
|
8,
|
|
0, /* little-endian */
|
|
1 /* signed */);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
bu_ulonglong(const char *p, const formatdef *f)
|
|
{
|
|
#ifdef HAVE_LONG_LONG
|
|
unsigned PY_LONG_LONG x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | *bytes++;
|
|
} while (--i > 0);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
|
|
return PyLong_FromUnsignedLongLong(x);
|
|
#else
|
|
return _PyLong_FromByteArray((const unsigned char *)p,
|
|
8,
|
|
0, /* little-endian */
|
|
0 /* signed */);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
bu_float(const char *p, const formatdef *f)
|
|
{
|
|
return unpack_float(p, 0);
|
|
}
|
|
|
|
static PyObject *
|
|
bu_double(const char *p, const formatdef *f)
|
|
{
|
|
return unpack_double(p, 0);
|
|
}
|
|
|
|
static int
|
|
bp_int(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
Py_ssize_t i;
|
|
if (get_wrapped_long(v, &x) < 0)
|
|
return -1;
|
|
i = f->size;
|
|
if (i != SIZEOF_LONG) {
|
|
if ((i == 2) && (x < -32768 || x > 32767))
|
|
RANGE_ERROR(x, f, 0, 0xffffL);
|
|
#if (SIZEOF_LONG != 4)
|
|
else if ((i == 4) && (x < -2147483648L || x > 2147483647L))
|
|
RANGE_ERROR(x, f, 0, 0xffffffffL);
|
|
#endif
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
else if ((i == 1) && (x < -128 || x > 127))
|
|
RANGE_ERROR(x, f, 0, 0xffL);
|
|
#endif
|
|
}
|
|
do {
|
|
p[--i] = (char)x;
|
|
x >>= 8;
|
|
} while (i > 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
bp_uint(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
Py_ssize_t i;
|
|
if (get_wrapped_ulong(v, &x) < 0)
|
|
return -1;
|
|
i = f->size;
|
|
if (i != SIZEOF_LONG) {
|
|
unsigned long maxint = 1;
|
|
maxint <<= (unsigned long)(i * 8);
|
|
if (x >= maxint)
|
|
RANGE_ERROR(x, f, 1, maxint - 1);
|
|
}
|
|
do {
|
|
p[--i] = (char)x;
|
|
x >>= 8;
|
|
} while (i > 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
bp_longlong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
int res;
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
res = _PyLong_AsByteArray((PyLongObject *)v,
|
|
(unsigned char *)p,
|
|
8,
|
|
0, /* little_endian */
|
|
1 /* signed */);
|
|
Py_DECREF(v);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
bp_ulonglong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
int res;
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
res = _PyLong_AsByteArray((PyLongObject *)v,
|
|
(unsigned char *)p,
|
|
8,
|
|
0, /* little_endian */
|
|
0 /* signed */);
|
|
Py_DECREF(v);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
bp_float(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
return _PyFloat_Pack4(x, (unsigned char *)p, 0);
|
|
}
|
|
|
|
static int
|
|
bp_double(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
return _PyFloat_Pack8(x, (unsigned char *)p, 0);
|
|
}
|
|
|
|
static formatdef bigendian_table[] = {
|
|
{'x', 1, 0, NULL},
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
/* Native packers do range checking without overflow masking. */
|
|
{'b', 1, 0, nu_byte, bp_int},
|
|
{'B', 1, 0, nu_ubyte, bp_uint},
|
|
#else
|
|
{'b', 1, 0, nu_byte, np_byte},
|
|
{'B', 1, 0, nu_ubyte, np_ubyte},
|
|
#endif
|
|
{'c', 1, 0, nu_char, np_char},
|
|
{'s', 1, 0, NULL},
|
|
{'p', 1, 0, NULL},
|
|
{'h', 2, 0, bu_int, bp_int},
|
|
{'H', 2, 0, bu_uint, bp_uint},
|
|
{'i', 4, 0, bu_int, bp_int},
|
|
{'I', 4, 0, bu_uint, bp_uint},
|
|
{'l', 4, 0, bu_int, bp_int},
|
|
{'L', 4, 0, bu_uint, bp_uint},
|
|
{'q', 8, 0, bu_longlong, bp_longlong},
|
|
{'Q', 8, 0, bu_ulonglong, bp_ulonglong},
|
|
{'f', 4, 0, bu_float, bp_float},
|
|
{'d', 8, 0, bu_double, bp_double},
|
|
{0}
|
|
};
|
|
|
|
/* Little-endian routines. *****************************************************/
|
|
|
|
static PyObject *
|
|
lu_int(const char *p, const formatdef *f)
|
|
{
|
|
long x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | bytes[--i];
|
|
} while (i > 0);
|
|
/* Extend the sign bit. */
|
|
if (SIZEOF_LONG > f->size)
|
|
x |= -(x & (1L << ((8 * f->size) - 1)));
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static PyObject *
|
|
lu_uint(const char *p, const formatdef *f)
|
|
{
|
|
unsigned long x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | bytes[--i];
|
|
} while (i > 0);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong((long)x);
|
|
return PyLong_FromUnsignedLong((long)x);
|
|
}
|
|
|
|
static PyObject *
|
|
lu_longlong(const char *p, const formatdef *f)
|
|
{
|
|
#ifdef HAVE_LONG_LONG
|
|
PY_LONG_LONG x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | bytes[--i];
|
|
} while (i > 0);
|
|
/* Extend the sign bit. */
|
|
if (SIZEOF_LONG_LONG > f->size)
|
|
x |= -(x & (1L << ((8 * f->size) - 1)));
|
|
if (x >= LONG_MIN && x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
|
|
return PyLong_FromLongLong(x);
|
|
#else
|
|
return _PyLong_FromByteArray((const unsigned char *)p,
|
|
8,
|
|
1, /* little-endian */
|
|
1 /* signed */);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
lu_ulonglong(const char *p, const formatdef *f)
|
|
{
|
|
#ifdef HAVE_LONG_LONG
|
|
unsigned PY_LONG_LONG x = 0;
|
|
Py_ssize_t i = f->size;
|
|
const unsigned char *bytes = (const unsigned char *)p;
|
|
do {
|
|
x = (x<<8) | bytes[--i];
|
|
} while (i > 0);
|
|
if (x <= LONG_MAX)
|
|
return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
|
|
return PyLong_FromUnsignedLongLong(x);
|
|
#else
|
|
return _PyLong_FromByteArray((const unsigned char *)p,
|
|
8,
|
|
1, /* little-endian */
|
|
0 /* signed */);
|
|
#endif
|
|
}
|
|
|
|
static PyObject *
|
|
lu_float(const char *p, const formatdef *f)
|
|
{
|
|
return unpack_float(p, 1);
|
|
}
|
|
|
|
static PyObject *
|
|
lu_double(const char *p, const formatdef *f)
|
|
{
|
|
return unpack_double(p, 1);
|
|
}
|
|
|
|
static int
|
|
lp_int(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
long x;
|
|
Py_ssize_t i;
|
|
if (get_wrapped_long(v, &x) < 0)
|
|
return -1;
|
|
i = f->size;
|
|
if (i != SIZEOF_LONG) {
|
|
if ((i == 2) && (x < -32768 || x > 32767))
|
|
RANGE_ERROR(x, f, 0, 0xffffL);
|
|
#if (SIZEOF_LONG != 4)
|
|
else if ((i == 4) && (x < -2147483648L || x > 2147483647L))
|
|
RANGE_ERROR(x, f, 0, 0xffffffffL);
|
|
#endif
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
else if ((i == 1) && (x < -128 || x > 127))
|
|
RANGE_ERROR(x, f, 0, 0xffL);
|
|
#endif
|
|
}
|
|
do {
|
|
*p++ = (char)x;
|
|
x >>= 8;
|
|
} while (--i > 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
lp_uint(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
unsigned long x;
|
|
Py_ssize_t i;
|
|
if (get_wrapped_ulong(v, &x) < 0)
|
|
return -1;
|
|
i = f->size;
|
|
if (i != SIZEOF_LONG) {
|
|
unsigned long maxint = 1;
|
|
maxint <<= (unsigned long)(i * 8);
|
|
if (x >= maxint)
|
|
RANGE_ERROR(x, f, 1, maxint - 1);
|
|
}
|
|
do {
|
|
*p++ = (char)x;
|
|
x >>= 8;
|
|
} while (--i > 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
lp_longlong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
int res;
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
res = _PyLong_AsByteArray((PyLongObject*)v,
|
|
(unsigned char *)p,
|
|
8,
|
|
1, /* little_endian */
|
|
1 /* signed */);
|
|
Py_DECREF(v);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
lp_ulonglong(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
int res;
|
|
v = get_pylong(v);
|
|
if (v == NULL)
|
|
return -1;
|
|
res = _PyLong_AsByteArray((PyLongObject*)v,
|
|
(unsigned char *)p,
|
|
8,
|
|
1, /* little_endian */
|
|
0 /* signed */);
|
|
Py_DECREF(v);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
lp_float(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
return _PyFloat_Pack4(x, (unsigned char *)p, 1);
|
|
}
|
|
|
|
static int
|
|
lp_double(char *p, PyObject *v, const formatdef *f)
|
|
{
|
|
double x = PyFloat_AsDouble(v);
|
|
if (x == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(StructError,
|
|
"required argument is not a float");
|
|
return -1;
|
|
}
|
|
return _PyFloat_Pack8(x, (unsigned char *)p, 1);
|
|
}
|
|
|
|
static formatdef lilendian_table[] = {
|
|
{'x', 1, 0, NULL},
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
/* Native packers do range checking without overflow masking. */
|
|
{'b', 1, 0, nu_byte, lp_int},
|
|
{'B', 1, 0, nu_ubyte, lp_uint},
|
|
#else
|
|
{'b', 1, 0, nu_byte, np_byte},
|
|
{'B', 1, 0, nu_ubyte, np_ubyte},
|
|
#endif
|
|
{'c', 1, 0, nu_char, np_char},
|
|
{'s', 1, 0, NULL},
|
|
{'p', 1, 0, NULL},
|
|
{'h', 2, 0, lu_int, lp_int},
|
|
{'H', 2, 0, lu_uint, lp_uint},
|
|
{'i', 4, 0, lu_int, lp_int},
|
|
{'I', 4, 0, lu_uint, lp_uint},
|
|
{'l', 4, 0, lu_int, lp_int},
|
|
{'L', 4, 0, lu_uint, lp_uint},
|
|
{'q', 8, 0, lu_longlong, lp_longlong},
|
|
{'Q', 8, 0, lu_ulonglong, lp_ulonglong},
|
|
{'f', 4, 0, lu_float, lp_float},
|
|
{'d', 8, 0, lu_double, lp_double},
|
|
{0}
|
|
};
|
|
|
|
|
|
static const formatdef *
|
|
whichtable(char **pfmt)
|
|
{
|
|
const char *fmt = (*pfmt)++; /* May be backed out of later */
|
|
switch (*fmt) {
|
|
case '<':
|
|
return lilendian_table;
|
|
case '>':
|
|
case '!': /* Network byte order is big-endian */
|
|
return bigendian_table;
|
|
case '=': { /* Host byte order -- different from native in aligment! */
|
|
int n = 1;
|
|
char *p = (char *) &n;
|
|
if (*p == 1)
|
|
return lilendian_table;
|
|
else
|
|
return bigendian_table;
|
|
}
|
|
default:
|
|
--*pfmt; /* Back out of pointer increment */
|
|
/* Fall through */
|
|
case '@':
|
|
return native_table;
|
|
}
|
|
}
|
|
|
|
|
|
/* Get the table entry for a format code */
|
|
|
|
static const formatdef *
|
|
getentry(int c, const formatdef *f)
|
|
{
|
|
for (; f->format != '\0'; f++) {
|
|
if (f->format == c) {
|
|
return f;
|
|
}
|
|
}
|
|
PyErr_SetString(StructError, "bad char in struct format");
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* Align a size according to a format code */
|
|
|
|
static int
|
|
align(Py_ssize_t size, char c, const formatdef *e)
|
|
{
|
|
if (e->format == c) {
|
|
if (e->alignment) {
|
|
size = ((size + e->alignment - 1)
|
|
/ e->alignment)
|
|
* e->alignment;
|
|
}
|
|
}
|
|
return size;
|
|
}
|
|
|
|
|
|
/* calculate the size of a format string */
|
|
|
|
static int
|
|
prepare_s(PyStructObject *self)
|
|
{
|
|
const formatdef *f;
|
|
const formatdef *e;
|
|
formatcode *codes;
|
|
|
|
const char *s;
|
|
const char *fmt;
|
|
char c;
|
|
Py_ssize_t size, len, num, itemsize, x;
|
|
|
|
fmt = PyString_AS_STRING(self->s_format);
|
|
|
|
f = whichtable((char **)&fmt);
|
|
|
|
s = fmt;
|
|
size = 0;
|
|
len = 0;
|
|
while ((c = *s++) != '\0') {
|
|
if (isspace(Py_CHARMASK(c)))
|
|
continue;
|
|
if ('0' <= c && c <= '9') {
|
|
num = c - '0';
|
|
while ('0' <= (c = *s++) && c <= '9') {
|
|
x = num*10 + (c - '0');
|
|
if (x/10 != num) {
|
|
PyErr_SetString(
|
|
StructError,
|
|
"overflow in item count");
|
|
return -1;
|
|
}
|
|
num = x;
|
|
}
|
|
if (c == '\0')
|
|
break;
|
|
}
|
|
else
|
|
num = 1;
|
|
|
|
e = getentry(c, f);
|
|
if (e == NULL)
|
|
return -1;
|
|
|
|
switch (c) {
|
|
case 's': /* fall through */
|
|
case 'p': len++; break;
|
|
case 'x': break;
|
|
default: len += num; break;
|
|
}
|
|
|
|
itemsize = e->size;
|
|
size = align(size, c, e);
|
|
x = num * itemsize;
|
|
size += x;
|
|
if (x/itemsize != num || size < 0) {
|
|
PyErr_SetString(StructError,
|
|
"total struct size too long");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
self->s_size = size;
|
|
self->s_len = len;
|
|
codes = PyMem_MALLOC((len + 1) * sizeof(formatcode));
|
|
if (codes == NULL) {
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
self->s_codes = codes;
|
|
|
|
s = fmt;
|
|
size = 0;
|
|
while ((c = *s++) != '\0') {
|
|
if (isspace(Py_CHARMASK(c)))
|
|
continue;
|
|
if ('0' <= c && c <= '9') {
|
|
num = c - '0';
|
|
while ('0' <= (c = *s++) && c <= '9')
|
|
num = num*10 + (c - '0');
|
|
if (c == '\0')
|
|
break;
|
|
}
|
|
else
|
|
num = 1;
|
|
|
|
e = getentry(c, f);
|
|
|
|
size = align(size, c, e);
|
|
if (c == 's' || c == 'p') {
|
|
codes->offset = size;
|
|
codes->size = num;
|
|
codes->fmtdef = e;
|
|
codes++;
|
|
size += num;
|
|
} else if (c == 'x') {
|
|
size += num;
|
|
} else {
|
|
while (--num >= 0) {
|
|
codes->offset = size;
|
|
codes->size = e->size;
|
|
codes->fmtdef = e;
|
|
codes++;
|
|
size += e->size;
|
|
}
|
|
}
|
|
}
|
|
codes->fmtdef = NULL;
|
|
codes->offset = size;
|
|
codes->size = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
s_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *self;
|
|
|
|
assert(type != NULL && type->tp_alloc != NULL);
|
|
|
|
self = type->tp_alloc(type, 0);
|
|
if (self != NULL) {
|
|
PyStructObject *s = (PyStructObject*)self;
|
|
Py_INCREF(Py_None);
|
|
s->s_format = Py_None;
|
|
s->s_codes = NULL;
|
|
s->s_size = -1;
|
|
s->s_len = -1;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
static int
|
|
s_init(PyObject *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyStructObject *soself = (PyStructObject *)self;
|
|
PyObject *o_format = NULL;
|
|
int ret = 0;
|
|
static char *kwlist[] = {"format", 0};
|
|
|
|
assert(PyStruct_Check(self));
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "S:Struct", kwlist,
|
|
&o_format))
|
|
return -1;
|
|
|
|
Py_INCREF(o_format);
|
|
Py_XDECREF(soself->s_format);
|
|
soself->s_format = o_format;
|
|
|
|
ret = prepare_s(soself);
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
s_dealloc(PyStructObject *s)
|
|
{
|
|
if (s->weakreflist != NULL)
|
|
PyObject_ClearWeakRefs((PyObject *)s);
|
|
if (s->s_codes != NULL) {
|
|
PyMem_FREE(s->s_codes);
|
|
}
|
|
Py_XDECREF(s->s_format);
|
|
s->ob_type->tp_free((PyObject *)s);
|
|
}
|
|
|
|
static PyObject *
|
|
s_unpack_internal(PyStructObject *soself, char *startfrom) {
|
|
formatcode *code;
|
|
Py_ssize_t i = 0;
|
|
PyObject *result = PyTuple_New(soself->s_len);
|
|
if (result == NULL)
|
|
return NULL;
|
|
|
|
for (code = soself->s_codes; code->fmtdef != NULL; code++) {
|
|
PyObject *v;
|
|
const formatdef *e = code->fmtdef;
|
|
const char *res = startfrom + code->offset;
|
|
if (e->format == 's') {
|
|
v = PyString_FromStringAndSize(res, code->size);
|
|
if (v == NULL)
|
|
goto fail;
|
|
PyTuple_SET_ITEM(result, i++, v);
|
|
} else if (e->format == 'p') {
|
|
Py_ssize_t n = *(unsigned char*)res;
|
|
if (n >= code->size)
|
|
n = code->size - 1;
|
|
v = PyString_FromStringAndSize(res + 1, n);
|
|
if (v == NULL)
|
|
goto fail;
|
|
PyTuple_SET_ITEM(result, i++, v);
|
|
} else {
|
|
v = e->unpack(res, e);
|
|
if (v == NULL)
|
|
goto fail;
|
|
PyTuple_SET_ITEM(result, i++, v);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
fail:
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(s_unpack__doc__,
|
|
"S.unpack(str) -> (v1, v2, ...)\n\
|
|
\n\
|
|
Return tuple containing values unpacked according to this Struct's format.\n\
|
|
Requires len(str) == self.size. See struct.__doc__ for more on format\n\
|
|
strings.");
|
|
|
|
static PyObject *
|
|
s_unpack(PyObject *self, PyObject *inputstr)
|
|
{
|
|
PyStructObject *soself = (PyStructObject *)self;
|
|
assert(PyStruct_Check(self));
|
|
assert(soself->s_codes != NULL);
|
|
if (inputstr == NULL || !PyString_Check(inputstr) ||
|
|
PyString_GET_SIZE(inputstr) != soself->s_size) {
|
|
PyErr_Format(StructError,
|
|
"unpack requires a string argument of length %zd", soself->s_size);
|
|
return NULL;
|
|
}
|
|
return s_unpack_internal(soself, PyString_AS_STRING(inputstr));
|
|
}
|
|
|
|
PyDoc_STRVAR(s_unpack_from__doc__,
|
|
"S.unpack_from(buffer[, offset]) -> (v1, v2, ...)\n\
|
|
\n\
|
|
Return tuple containing values unpacked according to this Struct's format.\n\
|
|
Unlike unpack, unpack_from can unpack values from any object supporting\n\
|
|
the buffer API, not just str. Requires len(buffer[offset:]) >= self.size.\n\
|
|
See struct.__doc__ for more on format strings.");
|
|
|
|
static PyObject *
|
|
s_unpack_from(PyObject *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static char *kwlist[] = {"buffer", "offset", 0};
|
|
#if (PY_VERSION_HEX < 0x02050000)
|
|
static char *fmt = "z#|i:unpack_from";
|
|
#else
|
|
static char *fmt = "z#|n:unpack_from";
|
|
#endif
|
|
Py_ssize_t buffer_len = 0, offset = 0;
|
|
char *buffer = NULL;
|
|
PyStructObject *soself = (PyStructObject *)self;
|
|
assert(PyStruct_Check(self));
|
|
assert(soself->s_codes != NULL);
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, fmt, kwlist,
|
|
&buffer, &buffer_len, &offset))
|
|
return NULL;
|
|
|
|
if (buffer == NULL) {
|
|
PyErr_Format(StructError,
|
|
"unpack_from requires a buffer argument");
|
|
return NULL;
|
|
}
|
|
|
|
if (offset < 0)
|
|
offset += buffer_len;
|
|
|
|
if (offset < 0 || (buffer_len - offset) < soself->s_size) {
|
|
PyErr_Format(StructError,
|
|
"unpack_from requires a buffer of at least %zd bytes",
|
|
soself->s_size);
|
|
return NULL;
|
|
}
|
|
return s_unpack_internal(soself, buffer + offset);
|
|
}
|
|
|
|
|
|
/*
|
|
* Guts of the pack function.
|
|
*
|
|
* Takes a struct object, a tuple of arguments, and offset in that tuple of
|
|
* argument for where to start processing the arguments for packing, and a
|
|
* character buffer for writing the packed string. The caller must insure
|
|
* that the buffer may contain the required length for packing the arguments.
|
|
* 0 is returned on success, 1 is returned if there is an error.
|
|
*
|
|
*/
|
|
static int
|
|
s_pack_internal(PyStructObject *soself, PyObject *args, int offset, char* buf)
|
|
{
|
|
formatcode *code;
|
|
Py_ssize_t i;
|
|
|
|
memset(buf, '\0', soself->s_size);
|
|
i = offset;
|
|
for (code = soself->s_codes; code->fmtdef != NULL; code++) {
|
|
Py_ssize_t n;
|
|
PyObject *v;
|
|
const formatdef *e = code->fmtdef;
|
|
char *res = buf + code->offset;
|
|
if (e->format == 's') {
|
|
v = PyTuple_GET_ITEM(args, i++);
|
|
if (!PyString_Check(v)) {
|
|
PyErr_SetString(StructError,
|
|
"argument for 's' must be a string");
|
|
return -1;
|
|
}
|
|
n = PyString_GET_SIZE(v);
|
|
if (n > code->size)
|
|
n = code->size;
|
|
if (n > 0)
|
|
memcpy(res, PyString_AS_STRING(v), n);
|
|
} else if (e->format == 'p') {
|
|
v = PyTuple_GET_ITEM(args, i++);
|
|
if (!PyString_Check(v)) {
|
|
PyErr_SetString(StructError,
|
|
"argument for 'p' must be a string");
|
|
return -1;
|
|
}
|
|
n = PyString_GET_SIZE(v);
|
|
if (n > (code->size - 1))
|
|
n = code->size - 1;
|
|
if (n > 0)
|
|
memcpy(res + 1, PyString_AS_STRING(v), n);
|
|
if (n > 255)
|
|
n = 255;
|
|
*res = Py_SAFE_DOWNCAST(n, Py_ssize_t, unsigned char);
|
|
} else {
|
|
v = PyTuple_GET_ITEM(args, i++);
|
|
if (e->pack(res, v, e) < 0) {
|
|
if (PyLong_Check(v) && PyErr_ExceptionMatches(PyExc_OverflowError))
|
|
PyErr_SetString(StructError,
|
|
"long too large to convert to int");
|
|
return -1;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Success */
|
|
return 0;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(s_pack__doc__,
|
|
"S.pack(v1, v2, ...) -> string\n\
|
|
\n\
|
|
Return a string containing values v1, v2, ... packed according to this\n\
|
|
Struct's format. See struct.__doc__ for more on format strings.");
|
|
|
|
static PyObject *
|
|
s_pack(PyObject *self, PyObject *args)
|
|
{
|
|
PyStructObject *soself;
|
|
PyObject *result;
|
|
|
|
/* Validate arguments. */
|
|
soself = (PyStructObject *)self;
|
|
assert(PyStruct_Check(self));
|
|
assert(soself->s_codes != NULL);
|
|
if (args == NULL || !PyTuple_Check(args) ||
|
|
PyTuple_GET_SIZE(args) != soself->s_len)
|
|
{
|
|
PyErr_Format(StructError,
|
|
"pack requires exactly %zd arguments", soself->s_len);
|
|
return NULL;
|
|
}
|
|
|
|
/* Allocate a new string */
|
|
result = PyString_FromStringAndSize((char *)NULL, soself->s_size);
|
|
if (result == NULL)
|
|
return NULL;
|
|
|
|
/* Call the guts */
|
|
if ( s_pack_internal(soself, args, 0, PyString_AS_STRING(result)) != 0 ) {
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(s_pack_to__doc__,
|
|
"S.pack_to(buffer, offset, v1, v2, ...)\n\
|
|
\n\
|
|
Pack the values v2, v2, ... according to this Struct's format, write \n\
|
|
the packed bytes into the writable buffer buf starting at offset. Note\n\
|
|
that the offset is not an optional argument. See struct.__doc__ for \n\
|
|
more on format strings.");
|
|
|
|
static PyObject *
|
|
s_pack_to(PyObject *self, PyObject *args)
|
|
{
|
|
PyStructObject *soself;
|
|
char *buffer;
|
|
Py_ssize_t buffer_len, offset;
|
|
|
|
/* Validate arguments. +1 is for the first arg as buffer. */
|
|
soself = (PyStructObject *)self;
|
|
assert(PyStruct_Check(self));
|
|
assert(soself->s_codes != NULL);
|
|
if (args == NULL || !PyTuple_Check(args) ||
|
|
PyTuple_GET_SIZE(args) != (soself->s_len + 2))
|
|
{
|
|
PyErr_Format(StructError,
|
|
"pack_to requires exactly %zd arguments",
|
|
(soself->s_len + 2));
|
|
return NULL;
|
|
}
|
|
|
|
/* Extract a writable memory buffer from the first argument */
|
|
if ( PyObject_AsWriteBuffer(PyTuple_GET_ITEM(args, 0),
|
|
(void**)&buffer, &buffer_len) == -1 ) {
|
|
return NULL;
|
|
}
|
|
assert( buffer_len >= 0 );
|
|
|
|
/* Extract the offset from the first argument */
|
|
offset = PyInt_AsLong(PyTuple_GET_ITEM(args, 1));
|
|
|
|
/* Support negative offsets. */
|
|
if (offset < 0)
|
|
offset += buffer_len;
|
|
|
|
/* Check boundaries */
|
|
if (offset < 0 || (buffer_len - offset) < soself->s_size) {
|
|
PyErr_Format(StructError,
|
|
"pack_to requires a buffer of at least %zd bytes",
|
|
soself->s_size);
|
|
return NULL;
|
|
}
|
|
|
|
/* Call the guts */
|
|
if ( s_pack_internal(soself, args, 2, buffer + offset) != 0 ) {
|
|
return NULL;
|
|
}
|
|
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static PyObject *
|
|
s_get_format(PyStructObject *self, void *unused)
|
|
{
|
|
Py_INCREF(self->s_format);
|
|
return self->s_format;
|
|
}
|
|
|
|
static PyObject *
|
|
s_get_size(PyStructObject *self, void *unused)
|
|
{
|
|
return PyInt_FromSsize_t(self->s_size);
|
|
}
|
|
|
|
/* List of functions */
|
|
|
|
static struct PyMethodDef s_methods[] = {
|
|
{"pack", (PyCFunction)s_pack, METH_VARARGS, s_pack__doc__},
|
|
{"pack_to", (PyCFunction)s_pack_to, METH_VARARGS, s_pack_to__doc__},
|
|
{"unpack", (PyCFunction)s_unpack, METH_O, s_unpack__doc__},
|
|
{"unpack_from", (PyCFunction)s_unpack_from, METH_KEYWORDS, s_unpack_from__doc__},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
PyDoc_STRVAR(s__doc__, "Compiled struct object");
|
|
|
|
#define OFF(x) offsetof(PyStructObject, x)
|
|
|
|
static PyGetSetDef s_getsetlist[] = {
|
|
{"format", (getter)s_get_format, (setter)NULL, "struct format string", NULL},
|
|
{"size", (getter)s_get_size, (setter)NULL, "struct size in bytes", NULL},
|
|
{NULL} /* sentinel */
|
|
};
|
|
|
|
static
|
|
PyTypeObject PyStructType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0,
|
|
"Struct",
|
|
sizeof(PyStructObject),
|
|
0,
|
|
(destructor)s_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
PyObject_GenericSetAttr, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS,/* tp_flags */
|
|
s__doc__, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(PyStructObject, weakreflist), /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
s_methods, /* tp_methods */
|
|
NULL, /* tp_members */
|
|
s_getsetlist, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
s_init, /* tp_init */
|
|
PyType_GenericAlloc,/* tp_alloc */
|
|
s_new, /* tp_new */
|
|
PyObject_Del, /* tp_free */
|
|
};
|
|
|
|
/* Module initialization */
|
|
|
|
PyMODINIT_FUNC
|
|
init_struct(void)
|
|
{
|
|
PyObject *m = Py_InitModule("_struct", NULL);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
PyStructType.ob_type = &PyType_Type;
|
|
if (PyType_Ready(&PyStructType) < 0)
|
|
return;
|
|
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
if (pyint_zero == NULL) {
|
|
pyint_zero = PyInt_FromLong(0);
|
|
if (pyint_zero == NULL)
|
|
return;
|
|
}
|
|
if (pylong_ulong_mask == NULL) {
|
|
#if (SIZEOF_LONG == 4)
|
|
pylong_ulong_mask = PyLong_FromString("FFFFFFFF", NULL, 16);
|
|
#else
|
|
pylong_ulong_mask = PyLong_FromString("FFFFFFFFFFFFFFFF", NULL, 16);
|
|
#endif
|
|
if (pylong_ulong_mask == NULL)
|
|
return;
|
|
}
|
|
|
|
#else
|
|
/* This speed trick can't be used until overflow masking goes away, because
|
|
native endian always raises exceptions instead of overflow masking. */
|
|
|
|
/* Check endian and swap in faster functions */
|
|
{
|
|
int one = 1;
|
|
formatdef *native = native_table;
|
|
formatdef *other, *ptr;
|
|
if ((int)*(unsigned char*)&one)
|
|
other = lilendian_table;
|
|
else
|
|
other = bigendian_table;
|
|
/* Scan through the native table, find a matching
|
|
entry in the endian table and swap in the
|
|
native implementations whenever possible
|
|
(64-bit platforms may not have "standard" sizes) */
|
|
while (native->format != '\0' && other->format != '\0') {
|
|
ptr = other;
|
|
while (ptr->format != '\0') {
|
|
if (ptr->format == native->format) {
|
|
/* Match faster when formats are
|
|
listed in the same order */
|
|
if (ptr == other)
|
|
other++;
|
|
/* Only use the trick if the
|
|
size matches */
|
|
if (ptr->size != native->size)
|
|
break;
|
|
/* Skip float and double, could be
|
|
"unknown" float format */
|
|
if (ptr->format == 'd' || ptr->format == 'f')
|
|
break;
|
|
ptr->pack = native->pack;
|
|
ptr->unpack = native->unpack;
|
|
break;
|
|
}
|
|
ptr++;
|
|
}
|
|
native++;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/* Add some symbolic constants to the module */
|
|
if (StructError == NULL) {
|
|
StructError = PyErr_NewException("struct.error", NULL, NULL);
|
|
if (StructError == NULL)
|
|
return;
|
|
}
|
|
|
|
Py_INCREF(StructError);
|
|
PyModule_AddObject(m, "error", StructError);
|
|
|
|
Py_INCREF((PyObject*)&PyStructType);
|
|
PyModule_AddObject(m, "Struct", (PyObject*)&PyStructType);
|
|
|
|
PyModule_AddIntConstant(m, "_PY_STRUCT_RANGE_CHECKING", 1);
|
|
#ifdef PY_STRUCT_OVERFLOW_MASKING
|
|
PyModule_AddIntConstant(m, "_PY_STRUCT_OVERFLOW_MASKING", 1);
|
|
#endif
|
|
}
|