From: jhuckaby <jhuckaby@50811bd7-b8ce-0310-adc1-d9db26280581>
Date: Thu, 16 Feb 2006 08:32:12 +0000 (+0000)
Subject: bugfix: now calling die() if file type does not match constructor type
X-Git-Tag: 0-97~68
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4904def3cc79c2356f5ca3e9bc426b7279e78790;p=dbsrgits%2FDBM-Deep.git

bugfix: now calling die() if file type does not match constructor type
        TIEHASH and TIEARRAY now set the type appropriately.

bugfix: now calling die() if the master index record could not be read.
---

diff --git a/lib/DBM/Deep.pm b/lib/DBM/Deep.pm
index 9f29344..ee85929 100644
--- a/lib/DBM/Deep.pm
+++ b/lib/DBM/Deep.pm
@@ -195,6 +195,8 @@ sub TIEHASH {
     #XXX This use of ref() is bad and is a bug
     elsif (ref($_[0])) { $args = $_[0]; }
     else { $args = { file => shift }; }
+    
+    $args->{type} = TYPE_HASH;
 
     return $class->_init($args);
 }
@@ -210,6 +212,8 @@ if (scalar(@_) > 1) { $args = {@_}; }
 	elsif (ref($_[0])) { $args = $_[0]; }
 	else { $args = { file => shift }; }
 	
+	$args->{type} = TYPE_ARRAY;
+	
 	return $class->_init($args);
 }
 
@@ -287,11 +291,15 @@ sub _open {
     # Get our type from master index signature
     ##
     my $tag = $self->load_tag($self->base_offset);
-#XXX This is a problem - need to verify type, not override it!
 #XXX We probably also want to store the hash algorithm name, not assume anything
 #XXX Convert to set_type() when one is written
-    $self->{type} = $tag->{signature};
-        
+    if (!$tag) {
+    	return $self->throw_error("Corrupted file, no master index record");
+    }
+    if ($self->{type} ne $tag->{signature}) {
+    	return $self->throw_error("File type mismatch");
+    }
+    
     return 1;
 }
 
@@ -333,7 +341,7 @@ sub load_tag {
 	my $offset = shift;
 	
 	seek($self->fh, $offset, 0);
-	if ($self->fh->eof()) { return; }
+	if ($self->fh->eof()) { return undef; }
 	
 	my $sig;
 	$self->fh->read($sig, SIG_SIZE);
@@ -1222,6 +1230,8 @@ sub STORE {
     my $self = _get_self($_[0]);
 	my $key = ($self->root->{filter_store_key} && $self->type eq TYPE_HASH) ? $self->root->{filter_store_key}->($_[1]) : $_[1];
     #XXX What is ref() checking here?
+    #YYY User may be storing a hash, in which case we do not want it run 
+    #YYY through the filtering system
 	my $value = ($self->root->{filter_store_value} && !ref($_[2])) ? $self->root->{filter_store_value}->($_[2]) : $_[2];
 	
 	my $unpacked_key = $key;