Changeset 9967

Timestamp:

2005-05-26T13:25:28+12:00 (19 years ago)

Author:

jrm21

Message:

added extra error checking (eg if asked for an unsupported encoding)

File:

• trunk/gsdl/perllib/unicode.pm (modified) (3 diffs)

trunk/gsdl/perllib/unicode.pm

@@ -411 +411 @@
     return 1 if (defined $unicode::translations{$encoding});
 
+    if (! -r $mapfile || -d $mapfile) {
+    return 0;
+    }
     return 0 unless open (MAPFILE, $mapfile);
     binmode (MAPFILE);
@@ -418 +421 @@
 
     my ($in,$i,$j);
-    while (read(MAPFILE, $in, 1) == 1) {
+    while (1) {
+    my $ret=read(MAPFILE, $in, 1);
+    if (!defined($ret)) { # error
+        print STDERR "unicode.pm: error reading mapfile: $!\n";
+        last;
+    }
+    if ($ret != 1) { last }
     $i = unpack ("C", $in);
     $block->{'map'}->[$i] = [@unicode::array256];
@@ -442 +451 @@
     my $outtext = "";
     my $encodename = "unicode-$encoding";
-    my $enc_info = $encodings::encodings->{"$encoding"};
+
+    if (!exists $encodings::encodings->{$encoding}) {
+    print STDERR "unicode.pm: ERROR - unsupported encoding "
+        . "'$encoding' requested\n";
+    return "";
+    }
+
+    my $enc_info = $encodings::encodings->{$encoding};
     my $mapfile = &util::filename_cat($ENV{'GSDLHOME'}, "mappings",
                       "from_uc", $enc_info->{'mapfile'});