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
1c920f3c
Commit
1c920f3c
authored
Aug 10, 2008
by
Christophe Fergeau
Committed by
Matt Colyer
Aug 11, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing g_free
Signed-off-by:
Matt Colyer
<
matt@colyer.name
>
parent
3c052f02
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
userpref.c
src/userpref.c
+12
-2
No files found.
src/userpref.c
View file @
1c920f3c
...
@@ -41,6 +41,7 @@ extern int debug;
...
@@ -41,6 +41,7 @@ extern int debug;
inline
void
create_config_dir
()
{
inline
void
create_config_dir
()
{
gchar
*
config_dir
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
NULL
);
gchar
*
config_dir
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
NULL
);
g_mkdir_with_parents
(
config_dir
,
755
);
g_mkdir_with_parents
(
config_dir
,
755
);
g_free
(
config_dir
);
return
;
return
;
}
}
...
@@ -59,6 +60,7 @@ char* get_host_id()
...
@@ -59,6 +60,7 @@ char* get_host_id()
g_free
(
loc_host_id
);
g_free
(
loc_host_id
);
}
}
g_key_file_free
(
key_file
);
g_key_file_free
(
key_file
);
g_free
(
config_file
);
if
(
debug
)
printf
(
"Using %s as HostID
\n
"
,
host_id
);
if
(
debug
)
printf
(
"Using %s as HostID
\n
"
,
host_id
);
return
host_id
;
return
host_id
;
...
@@ -95,11 +97,13 @@ int is_device_known(char* public_key)
...
@@ -95,11 +97,13 @@ int is_device_known(char* public_key)
g_io_channel_shutdown
(
keyfile
,
FALSE
,
NULL
);
g_io_channel_shutdown
(
keyfile
,
FALSE
,
NULL
);
pcur
++
;
pcur
++
;
}
}
g_free
(
keyfilepath
);
}
}
}
}
g_strfreev
(
devices_list
);
g_strfreev
(
devices_list
);
}
}
g_key_file_free
(
key_file
);
g_key_file_free
(
key_file
);
g_free
(
config_file
);
}
}
return
ret
;
return
ret
;
}
}
...
@@ -117,7 +121,7 @@ int store_device_public_key(char* public_key)
...
@@ -117,7 +121,7 @@ int store_device_public_key(char* public_key)
GKeyFile
*
key_file
=
g_key_file_new
();
GKeyFile
*
key_file
=
g_key_file_new
();
if
(
g_key_file_load_from_file
(
key_file
,
config_file
,
G_KEY_FILE_KEEP_COMMENTS
,
NULL
)
)
{
if
(
g_key_file_load_from_file
(
key_file
,
config_file
,
G_KEY_FILE_KEEP_COMMENTS
,
NULL
)
)
{
gchar
**
devices_list
=
g_key_file_get_string_list
(
key_file
,
"Global"
,
"DevicesList"
,
NULL
,
NULL
);
gchar
**
devices_list
=
g_key_file_get_string_list
(
key_file
,
"Global"
,
"DevicesList"
,
NULL
,
NULL
);
guint
length
=
0
;
guint
length
=
0
;
guint
wlength
=
0
;
guint
wlength
=
0
;
...
@@ -130,6 +134,7 @@ int store_device_public_key(char* public_key)
...
@@ -130,6 +134,7 @@ int store_device_public_key(char* public_key)
gchar
*
device_file
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
dev_file
,
NULL
);
gchar
*
device_file
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
dev_file
,
NULL
);
GIOChannel
*
file
=
g_io_channel_new_file
(
device_file
,
"w"
,
NULL
);
GIOChannel
*
file
=
g_io_channel_new_file
(
device_file
,
"w"
,
NULL
);
g_free
(
device_file
);
wlength
=
strlen
(
public_key
);
// why this wasn't discovered before... ugh
wlength
=
strlen
(
public_key
);
// why this wasn't discovered before... ugh
g_io_channel_write_chars
(
file
,
public_key
,
wlength
,
NULL
,
NULL
);
g_io_channel_write_chars
(
file
,
public_key
,
wlength
,
NULL
,
NULL
);
g_io_channel_shutdown
(
file
,
TRUE
,
NULL
);
g_io_channel_shutdown
(
file
,
TRUE
,
NULL
);
...
@@ -197,7 +202,6 @@ int init_config_file(char* host_id, gnutls_datum_t* root_key, gnutls_datum_t* ho
...
@@ -197,7 +202,6 @@ int init_config_file(char* host_id, gnutls_datum_t* root_key, gnutls_datum_t* ho
if
(
!
host_id
||
!
root_key
||
!
host_key
||
!
root_cert
||
!
host_cert
)
if
(
!
host_id
||
!
root_key
||
!
host_key
||
!
root_cert
||
!
host_cert
)
return
0
;
return
0
;
gchar
*
config_file
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
LIBIPHONE_CONF_FILE
,
NULL
);
/* make sure config directory exists*/
/* make sure config directory exists*/
create_config_dir
();
create_config_dir
();
...
@@ -211,7 +215,9 @@ int init_config_file(char* host_id, gnutls_datum_t* root_key, gnutls_datum_t* ho
...
@@ -211,7 +215,9 @@ int init_config_file(char* host_id, gnutls_datum_t* root_key, gnutls_datum_t* ho
/* write config file on disk */
/* write config file on disk */
gsize
length
;
gsize
length
;
gchar
*
buf
=
g_key_file_to_data
(
key_file
,
&
length
,
NULL
);
gchar
*
buf
=
g_key_file_to_data
(
key_file
,
&
length
,
NULL
);
gchar
*
config_file
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
LIBIPHONE_CONF_FILE
,
NULL
);
GIOChannel
*
file
=
g_io_channel_new_file
(
config_file
,
"w"
,
NULL
);
GIOChannel
*
file
=
g_io_channel_new_file
(
config_file
,
"w"
,
NULL
);
g_free
(
config_file
);
g_io_channel_write_chars
(
file
,
buf
,
length
,
NULL
,
NULL
);
g_io_channel_write_chars
(
file
,
buf
,
length
,
NULL
,
NULL
);
g_io_channel_shutdown
(
file
,
TRUE
,
NULL
);
g_io_channel_shutdown
(
file
,
TRUE
,
NULL
);
...
@@ -224,21 +230,25 @@ int init_config_file(char* host_id, gnutls_datum_t* root_key, gnutls_datum_t* ho
...
@@ -224,21 +230,25 @@ int init_config_file(char* host_id, gnutls_datum_t* root_key, gnutls_datum_t* ho
pFile
=
fopen
(
pem
,
"wb"
);
pFile
=
fopen
(
pem
,
"wb"
);
fwrite
(
root_key
->
data
,
1
,
root_key
->
size
,
pFile
);
fwrite
(
root_key
->
data
,
1
,
root_key
->
size
,
pFile
);
fclose
(
pFile
);
fclose
(
pFile
);
g_free
(
pem
);
pem
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
LIBIPHONE_HOST_PRIVKEY
,
NULL
);
pem
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
LIBIPHONE_HOST_PRIVKEY
,
NULL
);
pFile
=
fopen
(
pem
,
"wb"
);
pFile
=
fopen
(
pem
,
"wb"
);
fwrite
(
host_key
->
data
,
1
,
host_key
->
size
,
pFile
);
fwrite
(
host_key
->
data
,
1
,
host_key
->
size
,
pFile
);
fclose
(
pFile
);
fclose
(
pFile
);
g_free
(
pem
);
pem
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
LIBIPHONE_ROOT_CERTIF
,
NULL
);
pem
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
LIBIPHONE_ROOT_CERTIF
,
NULL
);
pFile
=
fopen
(
pem
,
"wb"
);
pFile
=
fopen
(
pem
,
"wb"
);
fwrite
(
root_cert
->
data
,
1
,
root_cert
->
size
,
pFile
);
fwrite
(
root_cert
->
data
,
1
,
root_cert
->
size
,
pFile
);
fclose
(
pFile
);
fclose
(
pFile
);
g_free
(
pem
);
pem
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
LIBIPHONE_HOST_CERTIF
,
NULL
);
pem
=
g_build_path
(
G_DIR_SEPARATOR_S
,
g_get_user_config_dir
(),
LIBIPHONE_CONF_DIR
,
LIBIPHONE_HOST_CERTIF
,
NULL
);
pFile
=
fopen
(
pem
,
"wb"
);
pFile
=
fopen
(
pem
,
"wb"
);
fwrite
(
host_cert
->
data
,
1
,
host_cert
->
size
,
pFile
);
fwrite
(
host_cert
->
data
,
1
,
host_cert
->
size
,
pFile
);
fclose
(
pFile
);
fclose
(
pFile
);
g_free
(
pem
);
return
1
;
return
1
;
}
}
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