Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libplist
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pwn
libplist
Commits
aa3a4c8d
Commit
aa3a4c8d
authored
Feb 14, 2009
by
Jonathan Beck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some memory leaks.
parent
461c947d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
29 deletions
+42
-29
bplist.c
src/bplist.c
+1
-0
plist.c
src/plist.c
+14
-2
plist.h
src/plist.h
+1
-1
xplist.c
src/xplist.c
+26
-26
No files found.
src/bplist.c
View file @
aa3a4c8d
...
@@ -487,6 +487,7 @@ void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist)
...
@@ -487,6 +487,7 @@ void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist)
}
}
*
plist
=
nodeslist
[
root_object
];
*
plist
=
nodeslist
[
root_object
];
free
(
nodeslist
);
}
}
static
guint
plist_data_hash
(
gconstpointer
key
)
static
guint
plist_data_hash
(
gconstpointer
key
)
...
...
src/plist.c
View file @
aa3a4c8d
...
@@ -44,16 +44,27 @@ plist_data_t plist_new_plist_data()
...
@@ -44,16 +44,27 @@ plist_data_t plist_new_plist_data()
return
data
;
return
data
;
}
}
void
plist_free_plist_data
(
plist_data_t
data
)
static
void
plist_free_node
(
GNode
*
node
,
gpointer
none
)
{
{
plist_data_t
data
=
plist_get_data
(
node
);
if
(
data
)
{
if
(
data
)
{
switch
(
data
->
type
)
{
switch
(
data
->
type
)
{
case
PLIST_KEY
:
case
PLIST_STRING
:
free
(
data
->
strval
);
break
;
case
PLIST_UNICODE
:
free
(
data
->
unicodeval
);
break
;
case
PLIST_DATA
:
free
(
data
->
buff
);
break
;
default:
default:
break
;
break
;
}
}
free
(
data
);
free
(
data
);
}
}
node
->
data
=
NULL
;
}
}
plist_t
plist_new_dict
()
plist_t
plist_new_dict
()
...
@@ -133,6 +144,7 @@ static plist_t plist_add_sub_element(plist_t node, plist_type type, const void *
...
@@ -133,6 +144,7 @@ static plist_t plist_add_sub_element(plist_t node, plist_type type, const void *
void
plist_free
(
plist_t
plist
)
void
plist_free
(
plist_t
plist
)
{
{
g_node_children_foreach
(
plist
,
G_TRAVERSE_ALL
,
plist_free_node
,
NULL
);
g_node_destroy
(
plist
);
g_node_destroy
(
plist
);
}
}
...
...
src/plist.h
View file @
aa3a4c8d
...
@@ -49,7 +49,7 @@ typedef struct plist_data_s *plist_data_t;
...
@@ -49,7 +49,7 @@ typedef struct plist_data_s *plist_data_t;
plist_t
plist_new_node
(
plist_data_t
data
);
plist_t
plist_new_node
(
plist_data_t
data
);
plist_data_t
plist_get_data
(
const
plist_t
node
);
plist_data_t
plist_get_data
(
const
plist_t
node
);
plist_data_t
plist_new_plist_data
();
plist_data_t
plist_new_plist_data
();
void
plist_free_plist_data
(
plist_data_t
node
);
#endif
#endif
src/xplist.c
View file @
aa3a4c8d
...
@@ -112,18 +112,6 @@ static xmlDocPtr new_xml_plist()
...
@@ -112,18 +112,6 @@ static xmlDocPtr new_xml_plist()
return
plist_xml
;
return
plist_xml
;
}
}
/** Destroys a previously created XML document.
*
* @param plist The XML document to destroy.
*/
static
void
free_plist
(
xmlDocPtr
plist
)
{
if
(
!
plist
)
return
;
xmlFreeDoc
(
plist
);
}
static
void
node_to_xml
(
GNode
*
node
,
gpointer
xml_struct
)
static
void
node_to_xml
(
GNode
*
node
,
gpointer
xml_struct
)
{
{
struct
xml_node
*
xstruct
=
NULL
;
struct
xml_node
*
xstruct
=
NULL
;
...
@@ -284,61 +272,72 @@ static void xml_to_node(xmlNodePtr xml_node, plist_t * plist_node)
...
@@ -284,61 +272,72 @@ static void xml_to_node(xmlNodePtr xml_node, plist_t * plist_node)
}
}
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_INT
))
{
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_INT
))
{
char
*
strval
=
(
char
*
)
xmlNodeGetContent
(
node
);
xmlChar
*
strval
=
xmlNodeGetContent
(
node
);
data
->
intval
=
g_ascii_strtoull
(
strval
,
NULL
,
0
);
data
->
intval
=
g_ascii_strtoull
(
(
char
*
)
strval
,
NULL
,
0
);
data
->
type
=
PLIST_UINT
;
data
->
type
=
PLIST_UINT
;
data
->
length
=
8
;
data
->
length
=
8
;
xmlFree
(
strval
);
continue
;
continue
;
}
}
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_REAL
))
{
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_REAL
))
{
char
*
strval
=
(
char
*
)
xmlNodeGetContent
(
node
);
xmlChar
*
strval
=
xmlNodeGetContent
(
node
);
data
->
realval
=
atof
(
strval
);
data
->
realval
=
atof
(
(
char
*
)
strval
);
data
->
type
=
PLIST_REAL
;
data
->
type
=
PLIST_REAL
;
data
->
length
=
8
;
data
->
length
=
8
;
xmlFree
(
strval
);
continue
;
continue
;
}
}
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_DATE
))
{
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_DATE
))
{
g_time_val_from_iso8601
((
char
*
)
xmlNodeGetContent
(
node
),
&
data
->
timeval
);
xmlChar
*
strval
=
xmlNodeGetContent
(
node
);
g_time_val_from_iso8601
((
char
*
)
strval
,
&
data
->
timeval
);
data
->
type
=
PLIST_DATE
;
data
->
type
=
PLIST_DATE
;
data
->
length
=
sizeof
(
GTimeVal
);
data
->
length
=
sizeof
(
GTimeVal
);
xmlFree
(
strval
);
continue
;
continue
;
}
}
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_STRING
))
{
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_STRING
))
{
xmlChar
*
strval
=
xmlNodeGetContent
(
node
);
tmp
=
xmlNodeGetContent
(
node
);
len
=
strlen
((
char
*
)
strval
);
len
=
strlen
((
char
*
)
tmp
);
items_read
=
0
;
items_read
=
0
;
items_written
=
0
;
items_written
=
0
;
error
=
NULL
;
error
=
NULL
;
type
=
xmlDetectCharEncoding
(
tmp
,
len
);
type
=
xmlDetectCharEncoding
(
strval
,
len
);
if
(
XML_CHAR_ENCODING_UTF8
==
type
)
{
if
(
XML_CHAR_ENCODING_UTF8
==
type
)
{
data
->
unicodeval
=
g_utf8_to_utf16
((
char
*
)
tmp
,
len
,
&
items_read
,
&
items_written
,
&
error
);
data
->
unicodeval
=
g_utf8_to_utf16
((
char
*
)
strval
,
len
,
&
items_read
,
&
items_written
,
&
error
);
data
->
type
=
PLIST_UNICODE
;
data
->
type
=
PLIST_UNICODE
;
data
->
length
=
items_written
;
data
->
length
=
items_written
;
}
else
if
(
XML_CHAR_ENCODING_ASCII
==
type
||
XML_CHAR_ENCODING_NONE
==
type
)
{
}
else
if
(
XML_CHAR_ENCODING_ASCII
==
type
||
XML_CHAR_ENCODING_NONE
==
type
)
{
data
->
strval
=
strdup
((
char
*
)
xmlNodeGetContent
(
node
)
);
data
->
strval
=
strdup
((
char
*
)
strval
);
data
->
type
=
PLIST_STRING
;
data
->
type
=
PLIST_STRING
;
data
->
length
=
strlen
(
data
->
strval
);
data
->
length
=
strlen
(
data
->
strval
);
}
}
xmlFree
(
strval
);
continue
;
continue
;
}
}
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_KEY
))
{
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_KEY
))
{
data
->
strval
=
strdup
((
char
*
)
xmlNodeGetContent
(
node
));
xmlChar
*
strval
=
xmlNodeGetContent
(
node
);
data
->
strval
=
strdup
((
char
*
)
strval
);
data
->
type
=
PLIST_KEY
;
data
->
type
=
PLIST_KEY
;
data
->
length
=
strlen
(
data
->
strval
);
data
->
length
=
strlen
(
data
->
strval
);
xmlFree
(
strval
);
continue
;
continue
;
}
}
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_DATA
))
{
if
(
!
xmlStrcmp
(
node
->
name
,
XPLIST_DATA
))
{
xmlChar
*
strval
=
xmlNodeGetContent
(
node
);
gsize
size
=
0
;
gsize
size
=
0
;
data
->
buff
=
g_base64_decode
((
char
*
)
xmlNodeGetContent
(
node
),
&
size
);
guchar
*
dec
=
g_base64_decode
((
char
*
)
strval
,
&
size
);
data
->
buff
=
(
uint8_t
*
)
malloc
(
size
*
sizeof
(
uint8_t
));
memcpy
(
data
->
buff
,
dec
,
size
*
sizeof
(
uint8_t
));
g_free
(
dec
);
data
->
length
=
size
;
data
->
length
=
size
;
data
->
type
=
PLIST_DATA
;
data
->
type
=
PLIST_DATA
;
xmlFree
(
strval
);
continue
;
continue
;
}
}
...
@@ -374,7 +373,7 @@ void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length)
...
@@ -374,7 +373,7 @@ void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length)
xmlDocDumpMemory
(
plist_doc
,
(
xmlChar
**
)
plist_xml
,
&
size
);
xmlDocDumpMemory
(
plist_doc
,
(
xmlChar
**
)
plist_xml
,
&
size
);
if
(
size
>=
0
)
if
(
size
>=
0
)
*
length
=
size
;
*
length
=
size
;
free_plist
(
plist_doc
);
xmlFreeDoc
(
plist_doc
);
}
}
void
plist_from_xml
(
const
char
*
plist_xml
,
uint32_t
length
,
plist_t
*
plist
)
void
plist_from_xml
(
const
char
*
plist_xml
,
uint32_t
length
,
plist_t
*
plist
)
...
@@ -383,4 +382,5 @@ void plist_from_xml(const char *plist_xml, uint32_t length, plist_t * plist)
...
@@ -383,4 +382,5 @@ void plist_from_xml(const char *plist_xml, uint32_t length, plist_t * plist)
xmlNodePtr
root_node
=
xmlDocGetRootElement
(
plist_doc
);
xmlNodePtr
root_node
=
xmlDocGetRootElement
(
plist_doc
);
xml_to_node
(
root_node
,
plist
);
xml_to_node
(
root_node
,
plist
);
xmlFreeDoc
(
plist_doc
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment