vcf-import.patch: New, fix exception when importing VCF files.
Yavor Doganov
6 years ago
| 0 | |
addresses-for-gnustep (0.4.8-3) UNRELEASED; urgency=medium
|
|
0 |
addresses-for-gnustep (0.4.8-3) unstable; urgency=medium
|
| 1 | 1 |
|
| 2 | 2 |
* Team upload.
|
| 3 | 3 |
* debian/patches/link-libs.patch: New, link against all needed libraries
|
| 4 | 4 |
(Closes: #889534, #889536). Cherry-picked from upstream with one
|
| 5 | 5 |
minor modification.
|
|
6 |
* debian/patches/vcf-import.patch: New, fix exception when importing
|
|
7 |
VCF files (LP: #461717).
|
| 6 | 8 |
* debian/patches/series: Update.
|
| 7 | 9 |
* debian/compat: Set to 11.
|
| 8 | 10 |
* debian/changelog: Remove trailing whitespace.
|
|
| 38 | 40 |
* debian/addressmanager.app.maintscript: Delete, no longer needed.
|
| 39 | 41 |
* debian/watch: Switch to HTTPS and Savannah's mirror multiplexer.
|
| 40 | 42 |
|
| 41 | |
-- Yavor Doganov <yavor@gnu.org> Mon, 05 Mar 2018 22:28:29 +0200
|
|
43 |
-- Yavor Doganov <yavor@gnu.org> Tue, 06 Mar 2018 07:36:44 +0200
|
| 42 | 44 |
|
| 43 | 45 |
addresses-for-gnustep (0.4.8-2) unstable; urgency=medium
|
| 44 | 46 |
|
|
0 |
vcf-import.patch
|
| 0 | 1 |
link-libs.patch
|
| 1 | 2 |
fix-adserver-format.patch
|
|
0 |
Description: Fix exception when importing .vcf files.
|
|
1 |
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/addresses-for-gnustep/+bug/461717
|
|
2 |
Author: Yavor Doganov <yavor@gnu.org>
|
|
3 |
Forwarded: https://savannah.nongnu.org/bugs/?53290
|
|
4 |
Last-Update: 2018-03-06
|
|
5 |
---
|
|
6 |
|
|
7 |
--- gnustep-addresses.orig/Frameworks/Addresses/ADConverter.m
|
|
8 |
+++ gnustep-addresses/Frameworks/Addresses/ADConverter.m
|
|
9 |
@@ -97,6 +97,12 @@
|
|
10 |
NSLog(@"Error while reading file %@", filename);
|
|
11 |
return nil;
|
|
12 |
}
|
|
13 |
+ string = [[NSString alloc] initWithData:data encoding: NSUTF8StringEncoding];
|
|
14 |
+ if (string)
|
|
15 |
+ {
|
|
16 |
+ NSLog(@"File in NSUTF8StringEncoding");
|
|
17 |
+ goto encoding;
|
|
18 |
+ }
|
|
19 |
string = [[NSString alloc] initWithData:data encoding:NSUnicodeStringEncoding];
|
|
20 |
if (string)
|
|
21 |
{
|
|
22 |
@@ -121,12 +127,6 @@
|
|
23 |
NSLog(@"File in NSUTF16LittleEndianStringEncoding");
|
|
24 |
goto encoding;
|
|
25 |
}
|
|
26 |
- string = [[NSString alloc] initWithData:data encoding: NSUTF8StringEncoding];
|
|
27 |
- if (string)
|
|
28 |
- {
|
|
29 |
- NSLog(@"File in NSUTF8StringEncoding");
|
|
30 |
- goto encoding;
|
|
31 |
- }
|
|
32 |
string = [[NSString alloc] initWithData:data encoding: NSISOLatin1StringEncoding];
|
|
33 |
if (string)
|
|
34 |
{
|
|
35 |
--- gnustep-addresses.orig/Frameworks/Addresses/ADVCFConverter.m
|
|
36 |
+++ gnustep-addresses/Frameworks/Addresses/ADVCFConverter.m
|
|
37 |
@@ -260,6 +260,9 @@
|
|
38 |
[person setValue: [NSDate date] forProperty: ADModificationDateProperty];
|
|
39 |
[person setValue: [NSDate date] forProperty: ADCreationDateProperty];
|
|
40 |
|
|
41 |
+ if (_idx > [_str length])
|
|
42 |
+ return nil;
|
|
43 |
+
|
|
44 |
str = [_str substringFromIndex: _idx];
|
|
45 |
|
|
46 |
lines = [str componentsSeparatedByString: @"\n"];
|