History log of /src/common/lib/libprop/prop_number.c |
Revision | | Date | Author | Comments |
1.39 |
| 14-May-2025 |
thorpej | Undo previous revert, and fix include ordering in prop_extern.c and prop_intern.c that broke tools build on some hosts.
|
1.38 |
| 13-May-2025 |
thorpej | Revert previous while I investigate the build failure.
|
1.37 |
| 13-May-2025 |
thorpej | Separate the {extern,intern}alize support routines into their own files, and reduce the verbosity of the names.
NFCI.
|
1.36 |
| 26-Apr-2025 |
thorpej | Hide the private symbols.
|
1.35 |
| 23-Apr-2025 |
thorpej | Add support for serializing to, and de-serializing from, JSON, as specified in RFC 8259. Format is automatically detected for input, and can be specified explicitly for output. The default format remains XML.
As part of this change, generic prop_object_{internalize,externalize}() functions are provided, and the "_with_format" flavor allows the output format to be specified. Previous array- and dictionary-specific routines remain for backwards compatibility.
|
1.34 |
| 03-Aug-2022 |
riastradh | proplib: Nix trailing whitespace.
|
1.33 |
| 06-Jun-2020 |
thorpej | Correct a deprecation warning.
|
1.32 |
| 06-Jun-2020 |
thorpej | Improvements to the problib(3) API:
==> Provide a much more complete set of setters and getters for different value types in the prop_array_util(3) and prop_dictionary_util(3) functions.
==> Overhaul the prop_data(3), prop_number(3), and prop_string(3) APIs to be easier to use and less awkwardly named, Deprecate the old awkward names, and produce link-time warnings when they are referenced.
==> Deprecate mutable prop_data(3) and prop_string(3) objects. The old APIs that support them still exist, but will now produce link-time warnings when used.
==> When the new prop_string(3) API is used, strings are internally de-duplicated as a memory footprint optimization.
==> Provide a rich set of bounds-checked gettter functions in and a corresponding set of convenience setters in the prop_number(3) API.
==> Add a new prop_bool_value(3) function that is equivalent to prop_bool_true(3), but aligned with the new "value" routines in prop_data(3), prop_string(3), and prop_number(3).
|
1.31 |
| 08-May-2019 |
thorpej | Fix building libprop as a host tool library on platforms that don't have the Matt Thomas rbtree:
- Include rb.c in libnbcompat, and provide a nbcompat sys/rbtree.h header. - Make sure libprop's source file include prop_object_impl.h before anything else, and pull in nbtool_config.h from there.
Tested by simulating such a host system by renaming the host's <sys/rbtree.h> out of the way (which reproduced the build failure) and verifying that the host-tool installboot contained the rb_* functions in its own .text segment.
|
1.30 |
| 28-Jun-2016 |
pgoyette | branches: 1.30.16; Fix the previous fix - there's only one _node suffix here!
|
1.29 |
| 28-Jun-2016 |
pgoyette | Missed a couple of function-call renames in previous
|
1.28 |
| 28-Jun-2016 |
pgoyette | The local copy of rb_tree code has been unused for quite some time. So we can just remove it, and adjust callers to use the "real" rbtree function names.
Addresses PR lib/44090
|
1.27 |
| 05-Sep-2014 |
matt | Eliminate use of C++ keywords and don't nest struct definitions.
|
1.26 |
| 26-Mar-2014 |
christos | kill sprintf
|
1.25 |
| 18-Oct-2013 |
martin | Make this compilable with gcc 4.8.1 without options DIAGNOSTIC.
|
1.24 |
| 27-Jul-2012 |
pooka | branches: 1.24.2; Bit-un-rot the proplib portability layer.
|
1.23 |
| 24-Sep-2010 |
rmind | branches: 1.23.6; Fixes/improvements to RB-tree implementation: 1. Fix inverted node order, so that negative value from comparison operator would represent lower (left) node, and positive - higher (right) node. 2. Add an argument (i.e. "context"), passed to comparison operators. 3. Change rb_tree_insert_node() to return a node - either inserted one or already existing one. 4. Amend the interface to manipulate the actual object, instead of the rb_node (in a similar way as Patricia-tree interface does). 5. Update all RB-tree users accordingly.
XXX: Perhaps rename rb.h to rbtree.h, since cleaning-up..
1-3 address the PR/43488 by Jeremy Huddleston.
Passes RB-tree regression tests. Reviewed by: matt@, christos@
|
1.22 |
| 15-Mar-2009 |
cegger | ansify function definitions
|
1.21 |
| 03-Jan-2009 |
pooka | branches: 1.21.2; Get rid of locks with static initializers using once and atomic ops. This makes proplib simplelock-free.
|
1.20 |
| 30-Nov-2008 |
haad | Fix two race conditions in proplib library. In prop_dictionary and prop_number there was small window in which was entry left in rb tree with reference count 0 which lead to rb tree coruption when another thread picked this up before it was released. Add 2 new members to the prop_object_t which are used for locking/unlocking rb tree guard mutex.
Ok by joerg@, core@, thorpej@
|
1.19 |
| 03-Aug-2008 |
thorpej | branches: 1.19.4; Fix an issue introduced with the prop_stack change: It's not a good idea to return a 3-value enum from a function declared to return bool. This broke the recurse case for prop_object_equals(). Instead, declare the object type equals routine to return a _prop_object_equals_rv_t.
Give the same treatment to the object type free routines: declare them to return a _prop_object_free_rv_t, and consistently check those return values againt the enum type.
Tidy up some whitespace while we're here.
|
1.18 |
| 17-Jun-2008 |
thorpej | _prop_rb_tree_insert_node() now returns true/false to indicate if the insertion succeeded. Update existing usage that arranges for insertions to always succeed to assert that they do.
|
1.17 |
| 28-Apr-2008 |
martin | branches: 1.17.2; Remove clause 3 and 4 from TNF licenses
|
1.16 |
| 05-Jan-2008 |
ad | branches: 1.16.4; Include sys/simplelock.h in prop_object_impl.h.
|
1.15 |
| 04-Jan-2008 |
xtraeme | sys/simplelock.h is required now.
|
1.14 |
| 30-Aug-2007 |
joerg | Avoid using unbound amount of stack frames in prop_object_equal by using a dynamic stack as well. Reorder arguments for the internalizer as the iteration is always present and should go before possibly NULL arguments.
Reviewed by mjf@ and adrianp@
|
1.13 |
| 16-Aug-2007 |
joerg | branches: 1.13.2; libprop is currently using a recursive parser. While this is fine for userland, deeply nested arrays and dictionaries can easily overflow the kernel stack and thereby force a panic.
Fix the internalizer and prop_object_release to use a separate call stack and alter the dictionary and array handling to not recurse on the C stack. The default stack has an inline depth of 16 elements, which should keep the overhead reasonable.
This issue was found by Pavel Cahyna and Jachym Holecek.
Additionally add a limit for prop_object_copyin_ioctl to prevent user programs from temporary allocating unbound amount of kernel memory. Allow malloc to fail so that tight loops of userland processes can't force panics by exhausting the kernel map.
Tested with the sample exploit of Jachym, his test suite and reviewed by himself (initial patch), Christos Zoulas and Jason Thorpe.
|
1.12 |
| 16-Aug-2007 |
thorpej | boolean_t -> bool TRUE -> true FALSE -> false
|
1.11 |
| 15-Oct-2006 |
christos | branches: 1.11.2; 1.11.4; 1.11.12; delete junk I accidentally committed.
|
1.10 |
| 15-Oct-2006 |
christos | de-lint.
|
1.9 |
| 12-Oct-2006 |
thorpej | Appease our stupid lint.
|
1.8 |
| 12-Oct-2006 |
thorpej | Make prop_number_t handle both signed and unsigned numbers. The *integer* routines now take int64_t arguments, and new *unsigned_integer* routines take uint64_t arguments. See prop_number(3) for complete details.
|
1.7 |
| 03-Oct-2006 |
thorpej | - Add a reader-writer lock to array and dictionary objects that ensures that the data structure is internally consistent in the face of multiple threads accessing it concurrently. This is not designed to provide application- level semantic consistency; applications are responsible for that locking protocol should it be necessary. - Rename _PROP_MUTEX_DECL() to _PROP_MUTEX_DECL_STATIC().
|
1.6 |
| 09-Sep-2006 |
thorpej | Adapt Matt Thomas's red-black tree implementation for use in proplib. This has a significant code size savings over <sys/tree.h>.
Also change prop_number_t to store all number objects in an r-b tree, only ever allocating one object for any given number (we can do this because numbers are immutable). This results in significant run-time memory savings.
|
1.5 |
| 22-Aug-2006 |
thorpej | Also guard object accessors against NULL (like we do foreign object types) so that apps can use this construct safely:
obj = prop_dictionary_get(dict, "value"); if (! prop_number_equals_integer(obj, 5)) { ... }
Suggested by Iain Hibbert.
|
1.4 |
| 21-Aug-2006 |
thorpej | Several changes to proplib: - Arrays can now be externalized and internalized in the same way dictionaries can. - Add new "externalize to file" and "internalize from file" functions to make reading a property list from a file and writing a property list to a file more convenient. - Many assertions in the object implementations are gone. Instead, calling an accessor for one object type with a different object type as an argument will return a suitable "invalid" value. - prop_object_type() now returns a new PROP_TYPE_UNKNOWN value if called with a NULL object. - Externalized property lists now contain a reference to the Apple XML plist DTD. - Add a new prop_ingest(3) facility, which provides a convenient way to translate a dictionary into an arbitrary binary representation.
|
1.3 |
| 07-Jul-2006 |
thorpej | branches: 1.3.2; Change prop_number_t to store a uint64_t, rather than a uintmax_t. No ABI change, and we ought to explicitly state that this is a fixed-width type, since that what it needs to be for binary plist support.
|
1.2 |
| 18-May-2006 |
thorpej | - Add prop_array_equals(), prop_dictionary_equals(), and prop_dictionary_keysym_equals(), and prop_object_equals() functions. - Use realloc() where it makes sense. There will be more changes in this area. - Add a _prop_object_type structure that is used internally to keep information about the object types. Decreases the footprint of the objects slightly by replacing several pointers with just one.
|
1.1 |
| 27-Apr-2006 |
thorpej | Initial commit of proplib, a library for manipulating property lists and converting to/from an XML external representation (based on Apple XML property lists). Works in the kernel and user space.
|
1.3.2.2 |
| 27-Aug-2006 |
riz | Pull up following revision(s) (requested by thorpej in ticket #51): common/lib/libprop/prop_dictionary.c: revision 1.11 common/lib/libprop/prop_number.c: revision 1.5 common/lib/libprop/prop_bool.c: revision 1.5 common/lib/libprop/prop_data.c: revision 1.4 common/lib/libprop/prop_string.c: revision 1.4 common/lib/libprop/prop_array.c: revision 1.6 Also guard object accessors against NULL (like we do foreign object types) so that apps can use this construct safely: obj = prop_dictionary_get(dict, "value"); if (! prop_number_equals_integer(obj, 5)) { ... } Suggested by Iain Hibbert.
|
1.3.2.1 |
| 23-Aug-2006 |
tron | Pull up following revision(s) (requested by thorpej in ticket #43): common/include/prop/prop_ingest.h: revision 1.1 common/lib/libprop/prop_number.c: revision 1.4 common/include/prop/prop_array.h: revision 1.3 common/lib/libprop/prop_object_impl.h: revision 1.4 common/include/prop/prop_dictionary.h: revision 1.4 distrib/sets/lists/comp/mi: revision 1.911 common/include/prop/Makefile: revision 1.2 common/lib/libprop/prop_bool.c: revision 1.4 distrib/sets/lists/base/shl.mi: revision 1.365 common/lib/libprop/prop_data.c: revision 1.3 lib/libprop/shlib_version: revision 1.4 lib/libprop/Makefile: revision 1.6 common/lib/libprop/prop_object.c: revision 1.4 common/lib/libprop/prop_object.3: revision 1.4 common/include/prop/proplib.h: revision 1.3 common/lib/libprop/Makefile.inc: revision 1.3 common/include/prop/prop_object.h: revision 1.4 common/lib/libprop/prop_array.c: revision 1.4 common/lib/libprop/prop_array.3: revision 1.4 common/lib/libprop/prop_string.c: revision 1.3 common/lib/libprop/prop_dictionary.3: revision 1.4 common/lib/libprop/prop_ingest.c: revision 1.1 common/lib/libprop/prop_ingest.3: revision 1.1 common/lib/libprop/prop_dictionary.c: revision 1.9 Several changes to proplib: - Arrays can now be externalized and internalized in the same way dictionaries can. - Add new "externalize to file" and "internalize from file" functions to make reading a property list from a file and writing a property list to a file more convenient. - Many assertions in the object implementations are gone. Instead, calling an accessor for one object type with a different object type as an argument will return a suitable "invalid" value. - prop_object_type() now returns a new PROP_TYPE_UNKNOWN value if called with a NULL object. - Externalized property lists now contain a reference to the Apple XML plist DTD. - Add a new prop_ingest(3) facility, which provides a convenient way to translate a dictionary into an arbitrary binary representation.
|
1.11.12.1 |
| 30-Sep-2007 |
wrstuden | Catch up on netbsd-4 as of a few days ago.
|
1.11.4.2 |
| 30-Nov-2008 |
snj | Pull up following revision(s) (requested by haad in ticket #1243): common/lib/libprop/prop_dictionary.c: revision 1.33 common/lib/libprop/prop_number.c: revision 1.20 common/lib/libprop/prop_object.c: revision 1.23 via patch common/lib/libprop/prop_object_impl.h: revision 1.28 Fix two race conditions in proplib library. In prop_dictionary and prop_number there was small window in which was entry left in rb tree with reference count 0 which lead to rb tree coruption when another thread picked this up before it was released. Add 2 new members to the prop_object_t which are used for locking/unlocking rb tree guard mutex. Ok by joerg@, core@, thorpej@
|
1.11.4.1 |
| 27-Sep-2007 |
xtraeme | branches: 1.11.4.1.2; Pull up following revision(s) (requested by joerg in ticket #904): sbin/veriexecctl/veriexecctl.c: revision 1.29 (via patch) common/lib/libprop/prop_string.c: revision 1.9 (via patch) distrib/sets/lists/comp/mi: revision 1.1063 (via patch) common/lib/libprop/prop_kern.c: revision 1.8 (via patch) common/include/prop/prop_string.h: revision 1.2 (via patch) common/include/prop/prop_ingest.h: revision 1.2 (via patch) usr.sbin/btdevctl/btdevctl.c: revision 1.5 (via patch) common/lib/libprop/prop_object_impl.h: revision 1.14 (via patch) common/lib/libprop/prop_rb.c: revision 1.7 (via patch) common/include/prop/prop_array.h: revision 1.5 (via patch) common/lib/libprop/prop_stack.h: revision 1.1 (via patch) common/lib/libprop/prop_object_impl.h: revision 1.16 (via patch) common/lib/libprop/prop_number.3: revision 1.7 (via patch) common/lib/libprop/prop_stack.h: revision 1.2 (via patch) common/lib/libprop/prop_stack.c: revision 1.1 (via patch) common/lib/libprop/prop_object_impl.h: revision 1.17 (via patch) common/lib/libprop/prop_dictionary_util.c: revision 1.2 (via patch) common/lib/libprop/prop_dictionary_util.3: revision 1.2 (via patch) common/lib/libprop/prop_dictionary.c: revision 1.18 (via patch) common/lib/libprop/prop_stack.c: revision 1.2 (via patch) common/lib/libprop/prop_object_impl.h: revision 1.18 (via patch) common/lib/libprop/prop_dictionary.c: revision 1.19 (via patch) common/include/prop/prop_bool.h: revision 1.3 (via patch) common/include/prop/prop_dictionary.h: revision 1.7 (via patch) common/include/prop/prop_data.h: revision 1.2 (via patch) sys/sys/dkio.h: revision 1.14 (via patch) usr.sbin/btdevctl/sdp.c: revision 1.4 (via patch) common/include/prop/Makefile: revision 1.3 (via patch) common/include/prop/prop_number.h: revision 1.5 (via patch) common/lib/libprop/prop_object.c: revision 1.14 (via patch) common/lib/libprop/prop_object.c: revision 1.15 (via patch) common/lib/libprop/prop_object.c: revision 1.16 (via patch) common/lib/libprop/prop_bool.3: revision 1.3 (via patch) common/lib/libprop/prop_data.3: revision 1.4 (via patch) common/lib/libprop/prop_object.3: revision 1.6 (via patch) common/lib/libprop/prop_data.c: revision 1.7 (via patch) common/lib/libprop/prop_data.c: revision 1.8 (via patch) common/lib/libprop/prop_data.c: revision 1.9 (via patch) common/lib/libprop/prop_dictionary.c: revision 1.20 (via patch) usr.sbin/btdevctl/print.c: revision 1.9 (via patch) sbin/veriexecctl/veriexecctl_parse.y: revision 1.22 (via patch) common/lib/libprop/prop_number.c: revision 1.12 (via patch) common/include/prop/proplib.h: revision 1.5 (via patch) common/lib/libprop/prop_number.c: revision 1.13 (via patch) common/lib/libprop/prop_number.c: revision 1.14 (via patch) common/include/prop/prop_object.h: revision 1.5 (via patch) common/lib/libprop/prop_array.3: revision 1.5 (via patch) common/include/prop/prop_object.h: revision 1.6 (via patch) common/lib/libprop/prop_string.3: revision 1.4 (via patch) common/lib/libprop/prop_bool.c: revision 1.10 (via patch) common/lib/libprop/Makefile.inc: revision 1.6 (via patch) common/lib/libprop/prop_ingest.c: revision 1.2 (via patch) common/lib/libprop/prop_bool.c: revision 1.11 (via patch) common/lib/libprop/prop_array.c: revision 1.10 (via patch) common/lib/libprop/prop_ingest.3: revision 1.3 (via patch) common/lib/libprop/prop_bool.c: revision 1.12 (via patch) common/lib/libprop/prop_array.c: revision 1.11 (via patch) common/lib/libprop/prop_string.c: revision 1.7 (via patch) common/lib/libprop/prop_dictionary.3: revision 1.8 (via patch) common/lib/libprop/prop_array.c: revision 1.9 (via patch) usr.sbin/btdevctl/db.c: revision 1.4 (via patch) common/lib/libprop/prop_string.c: revision 1.8 (via patch) common/include/prop/plistref.h: revision 1.1 (via patch) Consider '\r' to be white space. Discussed with and also kept as local change by freza. With this change, DOS style line endings work.
boolean_t -> bool TRUE -> true FALSE -> false
libprop is currently using a recursive parser. While this is fine for userland, deeply nested arrays and dictionaries can easily overflow the kernel stack and thereby force a panic.
Fix the internalizer and prop_object_release to use a separate call stack and alter the dictionary and array handling to not recurse on the C stack. The default stack has an inline depth of 16 elements, which should keep the overhead reasonable.
This issue was found by Pavel Cahyna and Jachym Holecek.
Additionally add a limit for prop_object_copyin_ioctl to prevent user programs from temporary allocating unbound amount of kernel memory.
Allow malloc to fail so that tight loops of userland processes can't force panics by exhausting the kernel map.
Tested with the sample exploit of Jachym, his test suite and reviewed by himself (initial patch), Christos Zoulas and Jason Thorpe. struct plistref does not reference other proplib data types, so split it in its own header file to be included by dkio.h. Fixes breakage due to pollution from proplib.h in programs which include ioctl.h. Tested and OK by dogcow@.
Attempt at fixing build failures after proplib was converted to bool: FALSE -> false, TRUE -> true, boolean_t -> bool, int -> bool when appropriate, include stdbool.h . proplib.h no longer provides boolean_t, so it is necessary to change to bool. From Tom Spindler (dogcow@).
Avoid using unbound amount of stack frames in prop_object_equal by using a dynamic stack as well. Reorder arguments for the internalizer as the iteration is always present and should go before possibly NULL arguments. Reviewed by mjf@ and adrianp@
|
1.11.4.1.2.1 |
| 30-Nov-2008 |
snj | Pull up following revision(s) (requested by haad in ticket #1243): common/lib/libprop/prop_dictionary.c: revision 1.33 common/lib/libprop/prop_number.c: revision 1.20 common/lib/libprop/prop_object.c: revision 1.23 via patch common/lib/libprop/prop_object_impl.h: revision 1.28 Fix two race conditions in proplib library. In prop_dictionary and prop_number there was small window in which was entry left in rb tree with reference count 0 which lead to rb tree coruption when another thread picked this up before it was released. Add 2 new members to the prop_object_t which are used for locking/unlocking rb tree guard mutex. Ok by joerg@, core@, thorpej@
|
1.11.2.2 |
| 15-Oct-2006 |
christos | delete junk I accidentally committed.
|
1.11.2.1 |
| 15-Oct-2006 |
christos | file prop_number.c was added on branch newlock2 on 2006-10-15 19:11:59 +0000
|
1.13.2.1 |
| 06-Nov-2007 |
matt | sync with HEAD
|
1.16.4.1 |
| 18-May-2008 |
yamt | sync with head.
|
1.17.2.2 |
| 18-Sep-2008 |
wrstuden | Sync with wrstuden-revivesa-base-2.
|
1.17.2.1 |
| 23-Jun-2008 |
wrstuden | Sync w/ -current. 34 merge conflicts to follow.
|
1.19.4.1 |
| 30-Nov-2008 |
snj | Pull up following revision(s) (requested by haad in ticket #150): common/lib/libprop/prop_dictionary.c: revision 1.33 common/lib/libprop/prop_number.c: revision 1.20 common/lib/libprop/prop_object.c: revision 1.23 common/lib/libprop/prop_object_impl.h: revision 1.28 Fix two race conditions in proplib library. In prop_dictionary and prop_number there was small window in which was entry left in rb tree with reference count 0 which lead to rb tree coruption when another thread picked this up before it was released. Add 2 new members to the prop_object_t which are used for locking/unlocking rb tree guard mutex. Ok by joerg@, core@, thorpej@
|
1.21.2.1 |
| 13-May-2009 |
jym | Sync with HEAD.
Commit is split, to avoid a "too many arguments" protocol error.
|
1.23.6.2 |
| 22-May-2014 |
yamt | sync with head.
for a reference, the tree before this commit was tagged as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments")
|
1.23.6.1 |
| 30-Oct-2012 |
yamt | sync with head
|
1.24.2.1 |
| 19-Aug-2014 |
tls | Rebase to HEAD as of a few days ago.
|
1.30.16.3 |
| 21-Apr-2020 |
martin | Ooops, restore accidently removed files from merge mishap
|
1.30.16.2 |
| 21-Apr-2020 |
martin | Sync with HEAD
|
1.30.16.1 |
| 10-Jun-2019 |
christos | Sync with HEAD
|