Move a NULL check to a place that makes more sense.
authorMark Michelson <mmichelson@digium.com>
Tue, 12 Nov 2013 19:08:14 +0000 (19:08 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 12 Nov 2013 19:08:14 +0000 (19:08 +0000)
commitc0bc3f6b4cbb988412a325b1de854c27d7db1cb6
tree74994a49a6ee475263e5417f4c3a1e310045f67c
parent12a0edac6956e79503def0c8949823d8586c440a
Move a NULL check to a place that makes more sense.

Two variables were being checked for NULLity immediately
after being declared NULL. I moved the NULL check until
after the variables are allocated.

This allows for the "channelvars" option in manager.conf
to work as intended again.
........

Merged revisions 402767 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402768 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c