Add CHECKs to prevent segfault for incorrect IMAGE_DATA layers. #1551
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@shelhamer @jeffdonahue what do you think? |
| @@ -29,6 +29,8 @@ void ImageDataLayer<Dtype>::DataLayerSetUp(const vector<Blob<Dtype>*>& bottom, | |||
| const string& source = this->layer_param_.image_data_param().source(); | |||
There was a problem hiding this comment.
how about a CHECK_GT(source.size(), 0)? Leaving it unspecified seems like the most common error mode so it would be good to have an error message specifically for that case.
|
Thanks @schenker, see my comments and I'll merge. |
|
@jeffdonahue i applied your suggestions. travis build timed out, but for me the tests succeed. |
|
Thanks, changes look good; please squash into a single commit for merge. |
Incomplete IMAGE_DATA layers cause a segmentation fault, e.g.:
layers {
name: "mnist"
type: IMAGE_DATA
top: "data"
top: "label"
image_data_param {
batch_size: 100
}
include: { phase: TRAIN }
}
or
layers {
name: "mnist"
type: IMAGE_DATA
top: "data"
top: "label"
data_param {
source: "./data/train.txt"
batch_size: 100
}
include: { phase: TRAIN }
}
Also empty image list files cause a segfault.
This is fixed by adding 3 CHECK instructions.
|
squashed it @jeffdonahue |
jeffdonahue
added a commit
that referenced
this pull request
Dec 20, 2014
Add CHECKs to prevent segfault for incorrect IMAGE_DATA layers.
|
Thanks @schenker! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Incomplete IMAGE_DATA layers cause a segmentation fault, e.g.:
layers {
name: "mnist"
type: IMAGE_DATA
top: "data"
top: "label"
image_data_param {
batch_size: 100
}
include: { phase: TRAIN }
}
or
layers {
name: "mnist"
type: IMAGE_DATA
top: "data"
top: "label"
data_param {
source: "./data/train.txt"
batch_size: 100
}
include: { phase: TRAIN }
}
Also empty image list files cause a segfault.
This is fixed by adding 2 CHECK instructions to ImageDataLayer::DataLayerSetUp()