|
 |
bb4267 |
From 8da7fc83aa3e9fd868c6a8da9261b72dae7d29e7 Mon Sep 17 00:00:00 2001
|
|
|
bb4267 |
From: Jakub Hrozek <jakub.hrozek@posteo.se>
|
|
|
bb4267 |
Date: Wed, 26 Sep 2018 21:38:02 +0200
|
|
|
bb4267 |
Subject: [PATCH 6/7] merge_ent_array_duplicates: Only use values if valid
|
|
|
bb4267 |
|
|
|
bb4267 |
Merges:
|
|
|
bb4267 |
https://pagure.io/libuser/issue/22
|
|
|
bb4267 |
|
|
|
bb4267 |
Don't attempt to dereference a NULL pointer
|
|
|
bb4267 |
---
|
|
|
bb4267 |
lib/user.c | 22 ++++++++++++++--------
|
|
|
bb4267 |
1 file changed, 14 insertions(+), 8 deletions(-)
|
|
|
bb4267 |
|
|
|
bb4267 |
diff --git a/lib/user.c b/lib/user.c
|
|
|
bb4267 |
index ad2bb099c7d12bd91188e69f188c64953b1d9748..2500565a544bb33a5e08d9807a794a42c819a2d2 100644
|
|
|
bb4267 |
--- a/lib/user.c
|
|
|
bb4267 |
+++ b/lib/user.c
|
|
|
bb4267 |
@@ -691,10 +691,13 @@ merge_ent_array_duplicates(GPtrArray *array)
|
|
|
bb4267 |
while (attributes != NULL) {
|
|
|
bb4267 |
attr = (const char *)attributes->data;
|
|
|
bb4267 |
values = lu_ent_get_current(current, attr);
|
|
|
bb4267 |
- for (j = 0; j < values->n_values; j++) {
|
|
|
bb4267 |
- value = g_value_array_get_nth(values,
|
|
|
bb4267 |
- j);
|
|
|
bb4267 |
- lu_ent_add_current(saved, attr, value);
|
|
|
bb4267 |
+ if (values != NULL) {
|
|
|
bb4267 |
+ for (j = 0; j < values->n_values; j++) {
|
|
|
bb4267 |
+ value = g_value_array_get_nth(
|
|
|
bb4267 |
+ values,
|
|
|
bb4267 |
+ j);
|
|
|
bb4267 |
+ lu_ent_add_current(saved, attr, value);
|
|
|
bb4267 |
+ }
|
|
|
bb4267 |
}
|
|
|
bb4267 |
attributes = g_list_next(attributes);
|
|
|
bb4267 |
}
|
|
|
bb4267 |
@@ -705,10 +708,13 @@ merge_ent_array_duplicates(GPtrArray *array)
|
|
|
bb4267 |
while (attributes != NULL) {
|
|
|
bb4267 |
attr = (const char *)attributes->data;
|
|
|
bb4267 |
values = lu_ent_get(current, attr);
|
|
|
bb4267 |
- for (j = 0; j < values->n_values; j++) {
|
|
|
bb4267 |
- value = g_value_array_get_nth(values,
|
|
|
bb4267 |
- j);
|
|
|
bb4267 |
- lu_ent_add(saved, attr, value);
|
|
|
bb4267 |
+ if (values != NULL) {
|
|
|
bb4267 |
+ for (j = 0; j < values->n_values; j++) {
|
|
|
bb4267 |
+ value = g_value_array_get_nth(
|
|
|
bb4267 |
+ values,
|
|
|
bb4267 |
+ j);
|
|
|
bb4267 |
+ lu_ent_add(saved, attr, value);
|
|
|
bb4267 |
+ }
|
|
|
bb4267 |
}
|
|
|
bb4267 |
attributes = g_list_next(attributes);
|
|
|
bb4267 |
}
|
|
|
bb4267 |
--
|
|
|
bb4267 |
2.14.4
|
|
|
bb4267 |
|