Zorba

Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Juan Zacarias
Approved revision: 11209
Merged at revision: 11448
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 12 lines (+1/-1)
1 file modified
bin/zorbacmdproperties_base.h (+1/-1)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Paul J. Lucas Approve
Review via email: mp+163627@code.launchpad.net

Commit message

Fixes stupid null-pointer dereference.

Description of the change

Fixes stupid null-pointer dereference.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-14T02-51-46.488Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-05-14T02-51-46.488Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/zorbacmdproperties_base.h'
2--- bin/zorbacmdproperties_base.h 2013-04-08 21:19:52 +0000
3+++ bin/zorbacmdproperties_base.h 2013-05-14 01:58:27 +0000
4@@ -289,7 +289,7 @@
5 int d = 2;
6 if(theFparm == false)
7 theAsFiles = false;
8- if(!strncmp(*(argv+1), "-f", 2))
9+ if(*(argv+1) && !strncmp(*(argv+1), "-f", 2))
10 {
11 theQBeforeF = true; // is it "-q -f <filename>" perhaps?
12 break; // stop functionality here

Subscribers

People subscribed via source and target branches